aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-07-05 11:01:36 -0400
committerNick Mathewson <nickm@torproject.org>2017-07-05 11:01:36 -0400
commitcd77ea782ede057c2086f25b3e2084c78dbde805 (patch)
treecdf69e8b67fb25be64e49e8275535f4abe6e1a74 /changes
parent46e83477c15d547e0a8d3df2926adf8ee10b77a6 (diff)
parent03b6cfd5911740471eac13e82f678fe50b4d18f9 (diff)
downloadtor-cd77ea782ede057c2086f25b3e2084c78dbde805.tar.gz
tor-cd77ea782ede057c2086f25b3e2084c78dbde805.zip
Merge branch 'neena-fix-1667'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug16674
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug1667 b/changes/bug1667
new file mode 100644
index 0000000000..368f9e35b2
--- /dev/null
+++ b/changes/bug1667
@@ -0,0 +1,4 @@
+ o Minor features (control port):
+ - If the control port is used as the HTTP proxy, responds with
+ a meaningful "This is the Tor control port" message, and log
+ the event. Closes ticket 1667. Patch from Ravi Chandra Padmala.