From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 21 Sep 2015 17:07:38 +0000 (-0400)
Subject: Disable --master-key as not-yet-working for 0.2.7
X-Git-Tag: tor-0.2.7.3-rc~24^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1911f80fb5630b78bfca9c2dc994addf8e401c77;p=thirdparty%2Ftor.git

Disable --master-key as not-yet-working for 0.2.7
---

diff --git a/src/or/config.c b/src/or/config.c
index d954316b3b..1962e24efd 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1920,7 +1920,11 @@ static const struct {
   { "--list-fingerprint",     TAKES_NO_ARGUMENT },
   { "--keygen",               TAKES_NO_ARGUMENT },
   { "--newpass",              TAKES_NO_ARGUMENT },
+#if 0
+/* XXXX028: This is not working yet in 0.2.7, so disabling with the
+ * minimal code modification. */
   { "--master-key",           ARGUMENT_NECESSARY },
+#endif
   { "--no-passphrase",        TAKES_NO_ARGUMENT },
   { "--passphrase-fd",        ARGUMENT_NECESSARY },
   { "--verify-config",        TAKES_NO_ARGUMENT },