Merge branch 'master' into patch-1

This commit is contained in:
Neil Alexander 2019-05-17 23:25:28 +01:00 committed by GitHub
commit 657bf1a934
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions

View File

@ -28,3 +28,7 @@ Yggdrasil configuration file to peer with these nodes.
* Dronten, operated by [REI](https://github.com/molecul)
* `tcp://yggdrasil.molecul.net:7499`
* Amsterdam, [Network Neighborhood](http://netwhood.online) public node, operated by [abslimit](http://netwhood.online/feedback/)
* `tcp://51.15.99.80:50001`
* `tcp://[2001:bc8:4700:2000::6b29]:50001`

View File

@ -11,5 +11,8 @@ Note that the following assumes Tor is running locally and listening on the defa
* HS3 (TCP-only, Hidden Service, v3), operated by [cathugger](http://cathug2kyi4ilneggumrenayhuhsvrgn6qv2y47bgeet42iivkpynqad.onion/contact.html)
* `socks://localhost:9050/yggnekkmyitzepgl5ltdl277y5wdg36n4pc45sualo3yesm3usnuwyad.onion:1863`
* HS3 (TCP-only, Hidden Service, v3), operated by [Mikaela](https://mikaela.info/)
* HS3 (TCP-only, Hidden Service, v3), operated by [Mikaela](https://mikaela.info/) ***CURRENTLY DOWN***
* `socks://127.0.0.1:9050/xvkw4rj7wzy7t75kkanr54zftudlbtpjbavxcsri5irkavclynaw3xqd.onion:1234`
* HS3 (TCP-only, Hidden Service, v3), operated by [Mikaela](https://mikaela.info/) on behalf of [Pirate Party Finland](https://piraattipuolue.fi/en) ([Tor Metrics](https://metrics.torproject.org/rs.html#details/796338999A7E34CA4C0F2C6092618C82C0D335D9))
* `"socks://127.0.0.1:9050/x7dqdmjb7y5ykj4kgirwzj62wrrd3t5dv57oy7oyidnf7cpthd4k7ryd.onion:5222"`