aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-07-07 10:51:28 -0400
committerNick Mathewson <nickm@torproject.org>2017-07-07 10:51:28 -0400
commit5472066cd21099d406e69ef810b83c153bd21e5b (patch)
tree047eaf13198d28e705d7a9f69d662a72218c39db
parent6cd6d488dc2469df82d74f0fcc3c84f5b45e8447 (diff)
parent715185477d135d87f8ebf6fb12804cb2db5856bb (diff)
downloadtor-5472066cd21099d406e69ef810b83c153bd21e5b.tar.gz
tor-5472066cd21099d406e69ef810b83c153bd21e5b.zip
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
-rw-r--r--changes/bug227893
1 files changed, 2 insertions, 1 deletions
diff --git a/changes/bug22789 b/changes/bug22789
index dc9fa29811..a653592848 100644
--- 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.