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
commit715185477d135d87f8ebf6fb12804cb2db5856bb (patch)
tree1fa265c9122156aacc5d1acebf4a506b57b3bf50
parentf6420bceec9707324fe23c98a2a70dd2612f183f (diff)
parent78dfa76ddcfd72015b0454e397de9a190e4e3106 (diff)
downloadtor-715185477d135d87f8ebf6fb12804cb2db5856bb.tar.gz
tor-715185477d135d87f8ebf6fb12804cb2db5856bb.zip
Merge branch 'maint-0.2.5' into maint-0.2.6
-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.