commit 0712d606c6c3111f939d07f48c9c361dd116f553 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 23 17:23:48 2012 -0400

Roll enh6876 into Changelog for 0.2.4.4 alpha, which had the change but not the entry. --- ChangeLog | 2 ++ changes/enh6876 | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog index d234807..f45ae9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,8 @@ Changes in version 0.2.4.4-alpha - 2012-10-20 place). Resolves ticket 6889. - Tor now builds correctly on Bitrig, an OpenBSD fork. Patch from dhill. Resolves ticket 6982. + - Option OutboundBindAddress can be specified multiple times and + accepts IPv6 addresses. Resolves ticket 6876.

o Minor bugfixes (also in 0.2.3.23-rc): - Don't serve or accept v2 hidden service descriptors over a diff --git a/changes/enh6876 b/changes/enh6876 deleted file mode 100644 index 9019fa4..0000000 --- a/changes/enh6876 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Option OutboundBindAddress can be specified multiple times and - accepts IPv6 addresses. Resolves ticket 6876.