aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-28 02:09:48 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-28 02:09:48 -0400
commit285cf998bcb5b228d82e7ff2aa13a532eee837a9 (patch)
tree7c9e46673f99194872591541a6844588b5a7fd32 /changes
parent8e09f7cf107056f99e47029ccf9a9403ef45bc59 (diff)
parentc3199495503930e33e7370d6c364b2b8b35844f4 (diff)
downloadtor-285cf998bcb5b228d82e7ff2aa13a532eee837a9.tar.gz
tor-285cf998bcb5b228d82e7ff2aa13a532eee837a9.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts: src/or/eventdns.c
Diffstat (limited to 'changes')
-rw-r--r--changes/bug25742
1 files changed, 2 insertions, 0 deletions
diff --git a/changes/bug2574 b/changes/bug2574
new file mode 100644
index 0000000000..32f4ae4a92
--- /dev/null
+++ b/changes/bug2574
@@ -0,0 +1,2 @@
+ o Minor features:
+ - Allow nameserves with IPv6 address. Fixes bug 2574.