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
commit78dfa76ddcfd72015b0454e397de9a190e4e3106 (patch)
treea90263007eae793fb5c92581bea3b0670b6b923b
parentff8c230d7cadb6c24dcf9c121521cff976fc83a5 (diff)
parentb47249e0bb6a8ef0f29f775352d1238b7133b938 (diff)
downloadtor-78dfa76ddcfd72015b0454e397de9a190e4e3106.tar.gz
tor-78dfa76ddcfd72015b0454e397de9a190e4e3106.zip
Merge branch 'maint-0.2.4' into maint-0.2.5
-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.