summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-02-16 08:47:41 -0500
committerNick Mathewson <nickm@torproject.org>2018-02-16 08:47:41 -0500
commit8970058af6822b14bc06e7a98230b8b13c0084a9 (patch)
tree0b0c653917b4b136b82851a508355b1c17e62a1f
parentd662d4470a9030ad485dde1eb5426f063f9c3cf1 (diff)
parentc8b087d90109d740e57d0347cb3df8d1be336337 (diff)
downloadtor-8970058af6822b14bc06e7a98230b8b13c0084a9.tar.gz
tor-8970058af6822b14bc06e7a98230b8b13c0084a9.zip
Merge branch 'maint-0.3.2' into maint-0.3.3
-rw-r--r--changes/bug24898-0296
1 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug24898-029 b/changes/bug24898-029
new file mode 100644
index 0000000000..b33f093841
--- /dev/null
+++ b/changes/bug24898-029
@@ -0,0 +1,6 @@
+ o Minor bugfixes (relay):
+ - Make the internal channel_is_client() function look at what sort
+ of connection handshake the other side used, rather than whether
+ the other side ever sent a create_fast cell to us. Backports part
+ of the fixes from bugs 22805 and 24898.
+