commit a4cf2ae24bf77c3c277a50b166fed0a09558d398 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 30 11:45:01 2014 -0500

Note fix for bug 12831 --- ChangeLog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 18bd536..4b7f35f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,8 +38,9 @@ Changes in version 0.2.6.2-alpha - 2014-12-?? - Repair automapping with IPv6 addresses; this automapping should have worked previously, but one piece of debugging code that we inserted to detect a regression actually caused the regression to - manifest itself again. Fixes bug 13811; bugfix on 0.2.4.7-alpha. - Diagnosed and fixed by Francisco Blas Izquierdo Riera. + manifest itself again. Fixes bug 13811 and bug 12831; bugfix on + 0.2.4.7-alpha. Diagnosed and fixed by Francisco Blas + Izquierdo Riera.

o Major bugfixes (hidden services): - When closing an introduction circuit that was opened in parallel