summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-07-05 18:45:44 -0400
committerNick Mathewson <nickm@torproject.org>2016-07-05 18:45:44 -0400
commit79213afd3a31aefebdf7d3f4dfe0c3583a959c1f (patch)
tree669191691805306038e83ed7c272437da2dec622
parent7e47709faa3fa29b0df6e268b38a33ef583c04cf (diff)
downloadtor-79213afd3a31aefebdf7d3f4dfe0c3583a959c1f.tar.gz
tor-79213afd3a31aefebdf7d3f4dfe0c3583a959c1f.zip
Fold 19271 into changelog
-rw-r--r--ChangeLog3
-rw-r--r--changes/192712
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 06577e5cce..f6b5ef80f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@ Changes in version 0.2.8.5-rc - 2016-07-0?
0.2.8 release will be identical to it. It has a few small bugfixes
against previous versions.
+ o Directory authority changes:
+ - Urras is no longer a directory authority. Closes ticket 19271.
+
o Major bugfixes (heartbeat):
- Fix regression that crashes Tor when disabling heartbeats. Fixes
bug 19454; bugfix on tor-0.2.8.1-alpha. Reported by "kubaku".
diff --git a/changes/19271 b/changes/19271
deleted file mode 100644
index dc06ead999..0000000000
--- a/changes/19271
+++ /dev/null
@@ -1,2 +0,0 @@
- o Directory authority changes:
- - Urras is no longer a directory authority. Closes ticket 19271.