Make PublishServerDescriptor default to 1, so the default doesn't

have to change as we invent new directory protocol versions.

svn:r12922

diff --git a/ChangeLog b/ChangeLog
index f25a5358122d43839a77aec852d4bac6c05ca5cc..b62c4fa10ed26c6e517e4ffab7291d7369071de4 100644 (file)
--- 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 0a0c014377ff2654be480df6f788cc006228f46b..d99b4b1f5ed5535d6a183d6a02bd8e155c693846 100644 (file)
--- 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),