summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-07-12 16:07:53 -0400
committerNick Mathewson <nickm@torproject.org>2015-07-12 16:07:53 -0400
commit3c4cbcb0733c063881dd1b4fc20eaebbf960c3a0 (patch)
tree580b72f8d3e693d21e8c8eca7b55e04af256b952
parent014f860205abfbbc2e7fe6afdaad2e77b631ed48 (diff)
downloadtor-3c4cbcb0733c063881dd1b4fc20eaebbf960c3a0.tar.gz
tor-3c4cbcb0733c063881dd1b4fc20eaebbf960c3a0.zip
Re-run format_changelog
-rw-r--r--ChangeLog7
1 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 30344fa3cd..7f68e6bc5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,10 +9,11 @@ Changes in version 0.2.6.10 - 2015-07-14
- Stop refusing to store updated hidden service descriptors on a
client. This reverts commit 9407040c59218 (which indeed fixed bug
14219, but introduced a major hidden service reachability
- regression detailed in bug 16381). This is a temporary fix since we
- can live with the minor issue in bug 14219 (it just results in
+ regression detailed in bug 16381). This is a temporary fix since
+ we can live with the minor issue in bug 14219 (it just results in
some load on the network) but the regression of 16381 is too much
- of a setback. First-round fix for bug 16381; bugfix on 0.2.6.3-alpha.
+ of a setback. First-round fix for bug 16381; bugfix
+ on 0.2.6.3-alpha.
o Major bugfixes (stability):
- Stop crashing with an assertion failure when parsing certain kinds