[tor-commits] [tor/release-0.2.8] Fold entry into changelog.

[nickm@xxxxxxxxxxxxxx]

commit 49e4848641d9cecb01c234e47562de8be77d0862
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Sep 23 11:12:54 2016 -0400

    Fold entry into changelog.
---
 ChangeLog                    | 4 ++++
 changes/broken-028-fallbacks | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 34526be..ee10bd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,10 @@ Changes in version 0.2.8.8 - 2016-09-2?
       0.2.8.1-alpha. Thanks to "cypherpunks" for help diagnosing
       this one.
 
+  o Minor feature (fallback directories):
+    - Remove broken fallbacks from the hard-coded fallback directory
+      list. Closes ticket 20190; patch by teor.
+
   o Minor features (geoip):
     - Update geoip and geoip6 to the September 6 2016 Maxmind GeoLite2
       Country database.
diff --git a/changes/broken-028-fallbacks b/changes/broken-028-fallbacks
deleted file mode 100644
index 698fd6e..0000000
--- a/changes/broken-028-fallbacks
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor feature (fallback directories):
-    - Remove broken fallbacks from the hard-coded fallback directory list.
-      Closes ticket 20190; patch by teor.



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits