summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-06-02 20:36:39 +0000
committerNick Mathewson <nickm@torproject.org>2004-06-02 20:36:39 +0000
commitdda75e8f0931a7586a09b3973b02661f992b6c71 (patch)
tree62b0400617a39df1ca6311fe767a4a60262f5e43
parent66881d570961dd6b7b283f56a38fdf6a0631ce68 (diff)
downloadtor-dda75e8f0931a7586a09b3973b02661f992b6c71.tar.gz
tor-dda75e8f0931a7586a09b3973b02661f992b6c71.zip
Document new config options in torrc.sample.in
svn:r1944
-rw-r--r--src/config/torrc.sample.in31
1 files changed, 30 insertions, 1 deletions
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 4eccb21845..547bd86bf3 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -7,6 +7,29 @@ RouterFile @CONFDIR@/dirservers
# Comment out if you don't want to allow applications to connect.
SocksPort 9050
SocksBindAddress 127.0.0.1 # accept connections only from localhost
+#SocksBindAddress 192.168.0.1:9100 # listen on a chosen IP/port
+
+# Exit policies to allow/deny SOCKS requests based on IP. By default,
+# we accept all requests to SocksBindAddress.
+#
+#SocksPolicy accept 192.168.0.1/16:*
+#SocksPolicy reject *:*
+
+# By default, we send log messages to the command line. If you want
+# them to go somewhere else, uncomment one or more of these example
+# configurations.
+### Send all messages of level 'warn' or higher to /var/log/tor/warnings
+#LogFile /var/log/tor/warnings
+#LogLevel warn
+### Send all debug and info messages to /var/log/tor/debug
+#LogFile /var/log/tor/debug
+#LogLevel debug-info
+### Send all debug messages ONLY to /var/log/tor/debug
+#LogFile /var/log/tor/debug
+#LogLevel debug-debug
+
+# Uncomment this to start the process in the background
+#RunAsDaemon 1
##################### Below is just for servers #####################
@@ -22,12 +45,18 @@ SocksBindAddress 127.0.0.1 # accept connections only from localhost
#ORPort 9001 # where to listen for tor connections
#ORBindAddress 0.0.0.0 # accept connections from anywhere
+#ORBindAddress 0.0.0.0:9090 # accept connections from anywhere, and
+ # listen on a port other than the one we
+ # advertised.
+
## A comma-separated list of exit policies. If you want to *replace*
## the default exit policy, end this with either a reject *:* or an
## accept *:*. Otherwise, you're *augmenting* (prepending to) the
## default exit policy. Leave commented to just use the default.
-#ExitPolicy accept *:6660-6667,reject *:*
+#ExitPolicy accept *:6660-6667
+#ExitPolicy reject 192.168.0.1:*
+#ExitPolicy reject *:*
##################### Below is just for location-hidden services ###