summaryrefslogtreecommitdiff
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
commit0e5cf4a215f182aedbfaa58579c1c1b6fef3af59 (patch)
tree8c52dcecf182ad1975d66cb218be36e914341ad3
parent9919638e98000b14982810db28e3f37fd1106bc9 (diff)
parent2dd1e21212c470e70be580a41c970380fc3c1bd9 (diff)
downloadtor-0e5cf4a215f182aedbfaa58579c1c1b6fef3af59.tar.gz
tor-0e5cf4a215f182aedbfaa58579c1c1b6fef3af59.zip
Merge branch 'maint-0.3.0' into maint-0.3.1
-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.