[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm@xxxxxxxxxxxxxx]

commit 3b08184338fd9b0b3e3bd3e5260684cd078beae0
Merge: c604a76a5 7d845976e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Dec 21 10:43:12 2017 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug24666           |  7 ++++
 src/or/circuitmux.c        | 34 +++++--------------
 src/or/circuitmux.h        |  2 +-
 src/or/or.h                | 15 +++++++++
 src/or/relay.c             | 82 ++++++++++++++++++++++++++++++++++++++++++++--
 src/or/relay.h             |  8 +++++
 src/test/test_circuitmux.c | 12 +++----
 7 files changed, 126 insertions(+), 34 deletions(-)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits