Merge remote-tracking branch 'tor-github/pr/1203'

This commit is contained in:
Nick Mathewson 2019-08-06 13:12:42 -04:00
commit f557680aa9
2 changed files with 6 additions and 0 deletions

View File

@ -88,6 +88,9 @@
## yourself to make this work. ## yourself to make this work.
#ORPort 443 NoListen #ORPort 443 NoListen
#ORPort 127.0.0.1:9090 NoAdvertise #ORPort 127.0.0.1:9090 NoAdvertise
## If you want to listen on IPv6 your numeric address must be explictly
## between square brackets as follows. You must also listen on IPv4.
#ORPort [2001:DB8::1]:9050
## The IP address or full DNS name for incoming connections to your ## The IP address or full DNS name for incoming connections to your
## relay. Leave commented out and Tor will guess. ## relay. Leave commented out and Tor will guess.

View File

@ -88,6 +88,9 @@
## yourself to make this work. ## yourself to make this work.
#ORPort 443 NoListen #ORPort 443 NoListen
#ORPort 127.0.0.1:9090 NoAdvertise #ORPort 127.0.0.1:9090 NoAdvertise
## If you want to listen on IPv6 your numeric address must be explictly
## between square brackets as follows. You must also listen on IPv4.
#ORPort [2001:DB8::1]:9050
## The IP address or full DNS name for incoming connections to your ## The IP address or full DNS name for incoming connections to your
## relay. Leave commented out and Tor will guess. ## relay. Leave commented out and Tor will guess.