diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-06-01 10:36:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-06-01 10:36:50 -0400 |
| commit | d4fa302646d78b58b1a6086e3f221d237a336c7b (patch) | |
| tree | 38828414ffe6b3674736328055ed97a8d19fb0b9 /doc | |
| parent | 312f4ee410de718aaf20030d22a93f1c258faa37 (diff) | |
| parent | b3b2a57bbf9da1edbfd7e0a53f53188720e3921e (diff) | |
| download | tor-d4fa302646d78b58b1a6086e3f221d237a336c7b.tar.gz tor-d4fa302646d78b58b1a6086e3f221d237a336c7b.zip | |
Merge commit 'sebastian/bug1381'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/HACKING | 2 | ||||
| -rw-r--r-- | doc/tor.1.txt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/HACKING b/doc/HACKING index 70bda65ab0..ac68a35a08 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -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? diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2ae5005d8c..8df2d0be81 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -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 |