diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-09-21 13:07:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-09-22 09:24:35 -0400 |
| commit | 1911f80fb5630b78bfca9c2dc994addf8e401c77 (patch) | |
| tree | ba7f82c701a9b9a9efb3e90ee82e917d865de471 | |
| parent | bca4211de5464cd159592b359b2f16eb64d3c07f (diff) | |
| download | tor-1911f80fb5630b78bfca9c2dc994addf8e401c77.tar.gz tor-1911f80fb5630b78bfca9c2dc994addf8e401c77.zip | |
Disable --master-key as not-yet-working for 0.2.7
| -rw-r--r-- | src/or/config.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 }, |