summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-28 02:13:14 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-28 02:13:14 -0400
commit1f18b5a5d532449f46a9c4b74d188870ea56d813 (patch)
tree76b002ad219a33ae85c987a71d30ca1b31c9d11f
parentc3199495503930e33e7370d6c364b2b8b35844f4 (diff)
parentf43aceb0f1b10d71d2e99e323668ac35327e286b (diff)
downloadtor-1f18b5a5d532449f46a9c4b74d188870ea56d813.tar.gz
tor-1f18b5a5d532449f46a9c4b74d188870ea56d813.zip
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
-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.
+