Merge commit 'sebastian/bug1381'

This commit is contained in:
Nick Mathewson 2010-06-01 10:36:50 -04:00
commit d4fa302646
2 changed files with 3 additions and 2 deletions

View File

@ -145,7 +145,7 @@ preference)
Did you remember...
- To build your code while configured with --enable-gcc-warnings?
- To run "make check-speces" on your code?
- To run "make check-spaces" on your code?
- To write unit tests, as possible?
- To base your code on the appropriate branch?
- To include a file in the "changes" directory as appropriate?

View File

@ -741,7 +741,8 @@ is non-zero):
**Address** __address__::
The IP address or fully qualified domain name of this server (e.g.
moria.mit.edu). You can leave this unset, and Tor will guess your IP
address.
address. Note that Tor doesn't bind to this IP, use the *ListenAddress
and OutboundBindAddress options to specify the IP Tor should bind to.
**AllowSingleHopExits** **0**|**1**::
This option controls whether clients can use this server as a single hop