aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-11-04 00:48:25 -0500
committerNick Mathewson <nickm@torproject.org>2014-11-04 00:48:25 -0500
commit60c86a3b79d542543f191a78f5c7ea2c77c0d3f0 (patch)
treef24602f15430925d2449054d2f5fae025936d41c /changes
parent593909ea70db9c00d3ae6d3448fb096464e0853d (diff)
parent74cbd8d55953969c15c60f025889b1e07a185a79 (diff)
downloadtor-60c86a3b79d542543f191a78f5c7ea2c77c0d3f0.tar.gz
tor-60c86a3b79d542543f191a78f5c7ea2c77c0d3f0.zip
Merge branch 'bug13315_squashed'
Conflicts: src/or/buffers.c
Diffstat (limited to 'changes')
-rw-r--r--changes/bug133155
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug13315 b/changes/bug13315
new file mode 100644
index 0000000000..c2ae5ff1f8
--- /dev/null
+++ b/changes/bug13315
@@ -0,0 +1,5 @@
+ o Minor features:
+ - Validate hostnames in SOCKS5 requests more strictly. If SafeSocks
+ is enabled, reject requests with IP addresses as hostnames. Resolves
+ ticket 13315.
+