commit 5c8440b13bde6c8847b9a54d12dadde26f6d37ed Author: Nick Mathewson nickm@torproject.org Date: Tue May 19 14:59:27 2015 -0400

add backport notes to changelog --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog index d5eab7c..25ab6e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,13 +3,13 @@ Changes in version 0.2.6.8 - 2015-05-2? fixes an authority-side bug in assigning the HSDir flag. All directory authorities should upgrade.

- o Major bugfixes (hidden services): + o Major bugfixes (hidden services, backport from 0.2.7.1-alpha): - Revert commit that made directory authorities assign the HSDir flag to relay without a DirPort; this was bad because such relays can't handle BEGIN_DIR cells. Fixes bug 15850; bugfix on tor-0.2.6.3-alpha.

- o Minor bugfixes (hidden service): + o Minor bugfixes (hidden service, backport from 0.2.7.1-alpha): - Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells on a client authorized hidden service. Fixes bug 15823; bugfix on 0.2.1.6-alpha.