[tor-commits] [tor/master] Disable --master-key as not-yet-working for 0.2.7

[nickm at torproject.org]

commit 1911f80fb5630b78bfca9c2dc994addf8e401c77
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 21 13:07:38 2015 -0400

    Disable --master-key as not-yet-working for 0.2.7
---
 src/or/config.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/or/config.c b/src/or/config.c
index d954316..1962e24 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 },