summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-03-09 19:46:55 -0400
committerNick Mathewson <nickm@torproject.org>2015-03-09 19:46:55 -0400
commit5e5b82febba1ca904abc59863115f0f4b325fdad (patch)
treed85eec9204ba6177758218f3e36958122c1cb238
parent98fa3956ac9d6aad165ee2c1d016cc582fe28d8e (diff)
downloadtor-5e5b82febba1ca904abc59863115f0f4b325fdad.tar.gz
tor-5e5b82febba1ca904abc59863115f0f4b325fdad.zip
Fix a couple of changelog issues noted by arma.
-rw-r--r--ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a20d55674b..e77a0c4afc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,9 +6,9 @@ Changes in version 0.2.6.4-rc - 2015-03-09
o Major bugfixes (relay, stability, possible security):
- Fix a bug that could lead to a relay crashing with an assertion
- failure if a buffer of exactly the wrong layout was passed to
+ failure if a buffer of exactly the wrong layout is passed to
buf_pullup() at exactly the wrong time. Fixes bug 15083; bugfix on
- 0.2.0.10-alpha. Patch from 'cypherpunks'.
+ 0.2.0.10-alpha. Patch from "cypherpunks".
- Do not assert if the 'data' pointer on a buffer is advanced to the
very end of the buffer; log a BUG message instead. Only assert if
it is past that point. Fixes bug 15083; bugfix on 0.2.0.10-alpha.