aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-02-09 12:47:38 -0500
committerNick Mathewson <nickm@torproject.org>2010-02-09 12:47:38 -0500
commitd784eecad9c2d25ff45b86e43a623b73c259b86f (patch)
tree47be56c3474fe8131c9154cabd671a8ca72e127a /src
parentc0d682686ad8df66b1f6680b1185853532f24429 (diff)
parent0e0c31b1b863bd996262e49d8df005e99ba8d5bc (diff)
downloadtor-d784eecad9c2d25ff45b86e43a623b73c259b86f.tar
tor-d784eecad9c2d25ff45b86e43a623b73c259b86f.tar.gz
Merge remote branch 'sebastian/exit-notice'
Diffstat (limited to 'src')
-rw-r--r--src/config/torrc.sample.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index c3b458543..dbbf19fe9 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -129,8 +129,9 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost
#DirListenAddress 0.0.0.0:9091
## Uncomment to return an arbitrary blob of html on your DirPort. Now you
## can explain what Tor is if anybody wonders why your IP address is
-## contacting them. See contrib/tor-exit-notice.html for a sample.
-#DirPortFrontPage /etc/tor/exit-notice.html
+## contacting them. See contrib/tor-exit-notice.html in Tor's source
+## distribution for a sample.
+#DirPortFrontPage @CONFDIR@/tor-exit-notice.html
## Uncomment this if you run more than one Tor relay, and add the identity
## key fingerprint of each Tor relay you control, even if they're on