diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-02-16 08:49:08 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-02-16 08:49:08 -0500 |
commit | cc17922645ff9224d70ab8c6e5f53bc705119267 (patch) | |
tree | 8cfdeb8c6a6c10321b619a2cf54de74b67ceabf0 | |
parent | 7e664bf74ff4c2374d59d4a663799454bb86d10a (diff) | |
parent | c67adddacb56f90d77786820f29ca2b4b9f91cae (diff) | |
download | tor-cc17922645ff9224d70ab8c6e5f53bc705119267.tar.gz tor-cc17922645ff9224d70ab8c6e5f53bc705119267.zip |
Merge branch 'maint-0.3.2' into release-0.3.2
-rw-r--r-- | changes/bug24898-029 | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/changes/bug24898-029 b/changes/bug24898-029 deleted file mode 100644 index b33f093841..0000000000 --- a/changes/bug24898-029 +++ /dev/null @@ -1,6 +0,0 @@ - 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. - |