From: Roger Dingledine <arma@torproject.org>
Date: Thu, 29 Nov 2007 15:37:17 +0000 (+0000)
Subject: two pieces of r12607 for karsten to look at closer
X-Git-Tag: tor-0.2.0.13-alpha~130
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fea55c7c2db42769a5b537ca89768c8c06143b7f;p=thirdparty%2Ftor.git

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 f7ac9ef6f3..f8587f18b4 100644
--- 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 155a5e69db..e354e2baa9 100644
--- 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;
     }