In the hidden service example in torrc.sample, stop recommending

esoteric and discouraged hidden service options.


svn:r8648

2 files changed, 5 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 364047025..324376418 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
 Changes in version 0.1.2.3-alpha - 2006-10-??
-
   o Minor bugfixes:
     - Change NT service functions to be loaded on demand.  This lets us
       build with mingw without breaking Tor for Windows 98 users.
+    - Do DirPort reachability tests less often, since a single test
+      chews through many circuits before giving up.
+    - In the hidden service example in torrc.sample, stop recommending
+      esoteric and discouraged hidden service options.
 
 
 Changes in version 0.1.2.2-alpha - 2006-10-07
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 7def88ed8..7792ffee2 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -1,5 +1,5 @@
 ## Configuration file for a typical Tor user
-## Last updated 31 July 2006 for Tor 0.1.2.1-alpha.
+## Last updated 8 October 2006 for Tor 0.1.2.3-alpha.
 ## (May or may not work for older or newer versions of Tor.)
 ##
 ## Lines that begin with "## " try to explain what's going on. Lines
@@ -75,8 +75,6 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost
 #HiddenServiceDir @LOCALSTATEDIR@/lib/tor/other_hidden_service/
 #HiddenServicePort 80 127.0.0.1:80
 #HiddenServicePort 22 127.0.0.1:22
-#HiddenServiceNodes moria1,moria2
-#HiddenServiceExcludeNodes bad,otherbad
 
 ################ This section is just for servers #####################