From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 22 Sep 2015 13:22:09 +0000 (-0400)
Subject: Remove --master-key form the changes file
X-Git-Tag: tor-0.2.7.3-rc~24^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8234fa00539cd6aa560c4fa1502a04e0f9e35a18;p=thirdparty%2Ftor.git

Remove --master-key form the changes file
---

diff --git a/changes/feature16769 b/changes/feature16769
index 49e9f3591a..acb2b9c0da 100644
--- a/changes/feature16769
+++ b/changes/feature16769
@@ -2,6 +2,3 @@
     - Add a --newpass option to allow changing or removing the
       passphrase of an encrypted key with tor --keygen. Implements
       part of ticket 16769.
-    - Add a --master-key option to allow overriding the location of
-      the master key when running tor --keygen.  Implements part of
-      ticket 16769.