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

teor at torproject.org teor at torproject.org
Wed Mar 13 23:06:43 UTC 2019


commit 547ee1c345f7333402610e5464cf0c243c24aa36
Merge: 6a3421546 e021f89f3
Author: teor <teor at torproject.org>
Date:   Thu Mar 14 06:56:43 2019 +1000

    Merge branch 'maint-0.3.4' into release-0.3.4

 changes/bug23512        |   6 +++
 changes/bug25733        |   4 ++
 changes/bug27073        |   4 ++
 changes/bug28096        |  13 ++++++
 src/common/compat.c     |  95 +++++++++++++++++++++++++++-------------
 src/or/channeltls.h     |   2 +
 src/or/circuitlist.c    |  59 +++++++++++++++++++++++++
 src/or/circuitlist.h    |   2 +
 src/or/or.h             |  12 +++++
 src/or/relay.c          |   1 +
 src/or/rephist.c        |  25 ++++++-----
 src/or/rephist.h        |  10 +++--
 src/or/scheduler_kist.c |   2 -
 src/test/test_relay.c   | 113 +++++++++++++++++++++++++++++++++++++++++++++---
 src/test/test_threads.c |  30 ++++++++-----
 15 files changed, 314 insertions(+), 64 deletions(-)



More information about the tor-commits mailing list