aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-28 02:13:25 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-28 02:13:25 -0400
commite676db656da1c3911f0667faa4fd2396db1c9e8f (patch)
tree70f82868bcbce2f8e43ede8435336d86ca6c6762 /changes
parent285cf998bcb5b228d82e7ff2aa13a532eee837a9 (diff)
parent1f18b5a5d532449f46a9c4b74d188870ea56d813 (diff)
downloadtor-e676db656da1c3911f0667faa4fd2396db1c9e8f.tar.gz
tor-e676db656da1c3911f0667faa4fd2396db1c9e8f.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug25743
1 files changed, 2 insertions, 1 deletions
diff --git a/changes/bug2574 b/changes/bug2574
index 32f4ae4a92..5cf2daebfa 100644
--- a/changes/bug2574
+++ b/changes/bug2574
@@ -1,2 +1,3 @@
o Minor features:
- - Allow nameserves with IPv6 address. Fixes bug 2574.
+ - Allow nameservers with IPv6 address. Fixes bug 2574.
+