tor

commit 5472066cd21099d406e69ef810b83c153bd21e5b
parent 6cd6d488dc2469df82d74f0fcc3c84f5b45e8447
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri,  7 Jul 2017 10:51:28 -0400

Merge branch 'maint-0.2.6' into maint-0.2.7-redux

Diffstat:
M
changes/bug22789
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/changes/bug22789 b/changes/bug22789
@@ -2,5 +2,6 @@
     - Avoid an assertion failure bug affecting our implementation of
       inet_pton(AF_INET6) on certain OpenBSD systems whose strtol()
       handling of "0xfoo" differs from what we had expected.
-      Fixes bug 22789; bugfix on 0.2.3.8-alpha.
+      Fixes bug 22789; bugfix on 0.2.3.8-alpha. Also tracked as
+      TROVE-2017-007.