Comment out the (unused) RunTesting option

The code that makes use of the RunTesting option is #if 0, so setting
this option has no effect. Mark the option as obsolete for now, so that
Tor doesn't list it as an available option erroneously.

diff --git a/src/or/config.c b/src/or/config.c
index ee0c466e0b72665ba78061f9e6fac992a39d8e0e..655af3797b048e316c1ec47e831b57dc5fd9db37 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -337,7 +337,8 @@ static config_var_t _option_vars[] = {
   V(RephistTrackTime,            INTERVAL, "24 hours"),
   OBSOLETE("RouterFile"),
   V(RunAsDaemon,                 BOOL,     "0"),
-  V(RunTesting,                  BOOL,     "0"),
+//  V(RunTesting,                  BOOL,     "0"),
+  OBSOLETE("RunTesting"), // currently unused
   V(SafeLogging,                 STRING,   "1"),
   V(SafeSocks,                   BOOL,     "0"),
   V(ServerDNSAllowBrokenConfig,  BOOL,     "1"),

diff --git a/src/or/or.h b/src/or/or.h
index 2e65459d46cd042f05cf4b65a12ae9c9df1789d6..e4d57dd7bf45a5e56a3edc1ee3f06a72e8d0fcf9 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2548,8 +2548,8 @@ typedef struct {
   uint64_t PerConnBWRate; /**< Long-term bw on a single TLS conn, if set. */
   uint64_t PerConnBWBurst; /**< Allowed burst on a single TLS conn, if set. */
   int NumCpus; /**< How many CPUs should we try to use? */
-  int RunTesting; /**< If true, create testing circuits to measure how well the
-                   * other ORs are running. */
+//int RunTesting; /**< If true, create testing circuits to measure how well the
+//                 * other ORs are running. */
   config_line_t *RendConfigLines; /**< List of configuration lines
                                           * for rendezvous services. */
   config_line_t *HidServAuth; /**< List of configuration lines for client-side