[tor-commits] [tor/master] Fold one more entry into changelog.

[nickm at torproject.org]

commit 7cd68b04def1c0256b98248d18680e4e4ed92071
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 16 12:50:56 2019 -0400

    Fold one more entry into changelog.
---
 ChangeLog           | 3 +++
 changes/ticket31678 | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01d6c26e1..8bec28b35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -219,6 +219,9 @@ Changes in version 0.4.2.1-alpha - 2019-09-??
       Fixes bug 30840; bugfix on 0.4.0.1-alpha.
     - Stop hard-coding the tor master branch name and worktree path in
       the git scripts. Fixes bug 30841; bugfix on 0.4.0.1-alpha.
+    - Allow git-push-all.sh to be run from any directory. Previously,
+      the script only worked if run from an upstream worktree directory.
+      Closes ticket 31678.
 
   o Minor bugfixes (guards):
     - When tor is missing descriptors for some primary entry guards,
diff --git a/changes/ticket31678 b/changes/ticket31678
deleted file mode 100644
index 157f1db7f..000000000
--- a/changes/ticket31678
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (git scripts):
-    - Allow git-push-all.sh to be run from any directory. Previously, the
-      script only worked if run from an upstream worktree directory.
-      Closes ticket 31678.