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
commit7e664bf74ff4c2374d59d4a663799454bb86d10a (patch)
treeab277bb9f4a54efc88cf3e6c8071d2e2056f07ac
parent4bfbce9de7ac84259e8c27939cace2952e98d0e6 (diff)
parentc8b087d90109d740e57d0347cb3df8d1be336337 (diff)
downloadtor-7e664bf74ff4c2374d59d4a663799454bb86d10a.tar.gz
tor-7e664bf74ff4c2374d59d4a663799454bb86d10a.zip
Merge branch 'maint-0.3.2' into release-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.
+