[tor-commits] [tor/release-0.2.9] fold 20935 into 0.2.9.7-rc changelog

[nickm at torproject.org]

commit 6b6ad81c2e140d8521307ff838f9068340e244f6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Dec 11 22:23:26 2016 -0500

    fold 20935 into 0.2.9.7-rc changelog
---
 ChangeLog        | 4 ++++
 changes/bug20935 | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c361a29..5671e0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,10 @@ Changes in version 0.2.9.7-rc - 2016-12-12
       from the sandbox's getaddrinfo() cache. Fixes bug 20710; bugfix on
       0.2.5.5-alpha. Patch from "cypherpunks".
 
+  o Minor bugfixes (portability):
+    - Use the correct spelling of MAC_OS_X_VERSION_10_12 on configure.ac
+      Fixes bug 20935; bugfix on 0.2.9.6-rc.
+
   o Minor bugfixes (unit tests):
     - Stop expecting NetBSD unit tests to report success for ipfw. Part
       of a fix for bug 19960; bugfix on 0.2.9.5-alpha.
diff --git a/changes/bug20935 b/changes/bug20935
deleted file mode 100644
index 78068c7..0000000
--- a/changes/bug20935
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (portability):
-    - Use the correct spelling of MAC_OS_X_VERSION_10_12 on configure.ac
-      Fixes bug 20935; bugfix on 0.2.9.6-rc.