aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-09-23 11:12:54 -0400
committerNick Mathewson <nickm@torproject.org>2016-09-23 11:12:54 -0400
commit49e4848641d9cecb01c234e47562de8be77d0862 (patch)
treefc96ea3befc6b6210591d3b102a33dff27530861
parent89e4126cd9cb438727756b0c577d3b08a4af6482 (diff)
downloadtor-49e4848641d9cecb01c234e47562de8be77d0862.tar.gz
tor-49e4848641d9cecb01c234e47562de8be77d0862.zip
Fold entry into changelog.
-rw-r--r--ChangeLog4
-rw-r--r--changes/broken-028-fallbacks3
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 34526be45f..ee10bd2bfb 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 698fd6e37a..0000000000
--- 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.