summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-07-13 12:12:16 -0400
committerNick Mathewson <nickm@torproject.org>2011-07-13 12:12:16 -0400
commit1aab5b6b391ca179d9acded9465ee4941ec4700b (patch)
treed9f4426a604f0f75e8a422b0f4e8181776374124 /changes
parent9a6642f6f5681fe92b17b87304126d2a3b2dec02 (diff)
parent16c5a62a66098274dde726c8e02110238866fe0b (diff)
downloadtor-1aab5b6b391ca179d9acded9465ee4941ec4700b.tar.gz
tor-1aab5b6b391ca179d9acded9465ee4941ec4700b.zip
Merge remote-tracking branch 'public/bug1666'
Conflicts: doc/spec/socks-extensions.txt src/or/buffers.c src/or/config.c src/or/connection_edge.c
Diffstat (limited to 'changes')
-rw-r--r--changes/bug16664
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug1666 b/changes/bug1666
new file mode 100644
index 0000000000..9fd790d4e4
--- /dev/null
+++ b/changes/bug1666
@@ -0,0 +1,4 @@
+ o Minor features:
+ - Accept attempts to include a password authenticator in the handshake, as
+ supported by SOCKS5. This handles SOCKS clients that don't know how to
+ omit the password when authenticating. Resolves bug 1666.