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
commitc8b087d90109d740e57d0347cb3df8d1be336337 (patch)
tree0f39bdc1b89cb28fb3798b06fe1e2045389123c3
parentcb9a322b675d0aa1178ab92af13b9ec92008c8d4 (diff)
parent3930ffdf63425c344e14c45cff6780108cfa038b (diff)
downloadtor-c8b087d90109d740e57d0347cb3df8d1be336337.tar.gz
tor-c8b087d90109d740e57d0347cb3df8d1be336337.zip
Merge branch 'maint-0.3.1' into maint-0.3.2
-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.
+