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

nickm at torproject.org nickm at torproject.org
Thu Dec 21 15:58:34 UTC 2017


commit cbe36a73984aa16c8fc2e2cce91c4e3b680428f0
Merge: bf8984a03 79a50afa0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 21 10:58:20 2017 -0500

    Merge branch 'maint-0.2.9' into release-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             | 79 ++++++++++++++++++++++++++++++++++++++++++++--
 src/or/relay.h             |  8 +++++
 src/test/test_circuitmux.c | 12 +++----
 7 files changed, 123 insertions(+), 34 deletions(-)



More information about the tor-commits mailing list