summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-29 16:13:04 -0400
committerNick Mathewson <nickm@torproject.org>2014-08-29 16:13:04 -0400
commitd6fa8239c86f49413e9ee86765059f43ceeb06c6 (patch)
treee4b2af85812b8490a4c77d86fe8b2d38adf98447 /changes
parent573d62748ab2cacfdbba5ea04e855d56708d34e8 (diff)
parent4a6f5bb2dda188ed1d1a80455bf9c9b0b3f00066 (diff)
downloadtor-d6fa8239c86f49413e9ee86765059f43ceeb06c6.tar.gz
tor-d6fa8239c86f49413e9ee86765059f43ceeb06c6.zip
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug129973
1 files changed, 3 insertions, 0 deletions
diff --git a/changes/bug12997 b/changes/bug12997
new file mode 100644
index 0000000000..fb6e7a8459
--- /dev/null
+++ b/changes/bug12997
@@ -0,0 +1,3 @@
+ o Minor features:
+ - Log more specific warnings when we get an ESTABLISH_RENDEZVOUS cell
+ on a cannibalized or non-OR circuit. Resolves ticket 12997.