summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-12-22 08:27:42 +0000
committerRoger Dingledine <arma@torproject.org>2007-12-22 08:27:42 +0000
commit39d910e97b31c9b39c2951f79ae63f23f16dda10 (patch)
treef9a66c3b168df134c09fde0ccd300a24272bea8f
parent6097e46420e8125c1495d63a430c956ddbff6410 (diff)
downloadtor-39d910e97b31c9b39c2951f79ae63f23f16dda10.tar.gz
tor-39d910e97b31c9b39c2951f79ae63f23f16dda10.zip
Make PublishServerDescriptor default to 1, so the default doesn't
have to change as we invent new directory protocol versions. svn:r12922
-rw-r--r--ChangeLog2
-rw-r--r--src/or/config.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f25a535812..b62c4fa10e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@ Changes in version 0.2.0.14-alpha - 2007-12-??
o Minor bugfixes:
- Make the unit tests build again.
- Make "GETINFO/desc-annotations/id/<OR digest>" actually work.
+ - Make PublishServerDescriptor default to 1, so the default doesn't
+ have to change as we invent new directory protocol versions.
Changes in version 0.2.0.13-alpha - 2007-12-21
diff --git a/src/or/config.c b/src/or/config.c
index 0a0c014377..d99b4b1f5e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -241,7 +241,7 @@ static config_var_t _option_vars[] = {
V(PidFile, STRING, NULL),
V(PreferTunneledDirConns, BOOL, "0"),
V(ProtocolWarnings, BOOL, "0"),
- V(PublishServerDescriptor, CSV, "v2,v3"),
+ V(PublishServerDescriptor, CSV, "1"),
V(PublishHidServDescriptors, BOOL, "1"),
V(ReachableAddresses, LINELIST, NULL),
V(ReachableDirAddresses, LINELIST, NULL),