summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-07-31 13:51:15 -0400
committerNick Mathewson <nickm@torproject.org>2013-07-31 13:51:15 -0400
commit904a58d10f144b95a689b35c88f6780371243da8 (patch)
tree174369db1cb98f3011124c306f3b06ae2b78b10d /changes
parentd5a5a6a2534e114b6c89c7ddb7840ab3040657b8 (diff)
parent8a0eedbbb08199818cd7c2c6998f062c03e33122 (diff)
downloadtor-904a58d10f144b95a689b35c88f6780371243da8.tar.gz
tor-904a58d10f144b95a689b35c88f6780371243da8.zip
Merge branch 'bug9288_rebased'
Conflicts: src/test/test_pt.c
Diffstat (limited to 'changes')
-rw-r--r--changes/bug92884
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug9288 b/changes/bug9288
new file mode 100644
index 0000000000..59bf414ea1
--- /dev/null
+++ b/changes/bug9288
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Fix an invalid memory read that occured when a pluggable
+ transport proxy failed its configuration protocol.
+ Fixes bug 9288.