[or-cvs] r12922: Make PublishServerDescriptor default to 1, so the default do (in tor/trunk: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2007-12-22 03:27:42 -0500 (Sat, 22 Dec 2007)
New Revision: 12922

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/config.c
Log:
Make PublishServerDescriptor default to 1, so the default doesn't
have to change as we invent new directory protocol versions.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-12-22 06:11:49 UTC (rev 12921)
+++ tor/trunk/ChangeLog	2007-12-22 08:27:42 UTC (rev 12922)
@@ -15,6 +15,8 @@
   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

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2007-12-22 06:11:49 UTC (rev 12921)
+++ tor/trunk/src/or/config.c	2007-12-22 08:27:42 UTC (rev 12922)
@@ -241,7 +241,7 @@
   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),