two pieces of r12607 for karsten to look at closer

svn:r12609

diff --git a/src/or/config.c b/src/or/config.c
index f7ac9ef6f30d707c21b7cd84dace8afc584920a6..f8587f18b4b807d9c674885662325bdef13ba31b 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -290,6 +290,7 @@ static config_var_t _option_vars[] = {
   VAR("__AllDirActionsPrivate",  BOOL,  AllDirActionsPrivate,     "0"),
   VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"),
   VAR("__LeaveStreamsUnattached",BOOL,  LeaveStreamsUnattached,   "0"),
+  /* XXX020 Karsten: this still needs a man page entry -RD */
   V(MinUptimeHidServDirectoryV2, INTERVAL, "24 hours"),
   { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
 };

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 155a5e69dbe8dde03a6fda69bcbd26ff87aab734..e354e2baa948d9ef83e0b72ef7cd379017a29153 100644 (file)
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -324,6 +324,9 @@ rend_config_services(or_options_t *options, int validate_only)
         version = atoi(version_str);
         versions_bitmask |= 1 << version;
       }
+      /* XXX020 Karsten: do you really want to overwrite the
+       * descriptor_version in the second line? Perhaps if both bits
+       * are set you want to leave it at -1? -RD */
       if (versions_bitmask == 1 << 0) service->descriptor_version = 0;
       if (versions_bitmask == 1 << 2) service->descriptor_version = 2;
     }