[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
nickm at torproject.org
nickm at torproject.org
Thu Nov 15 21:56:17 UTC 2018
commit b3235e21ab3dc2d31e6bd5a874290675ff4756bf
Merge: e8708c2fb cbe04d455
Author: Nick Mathewson <nickm at torproject.org>
Date: Thu Nov 15 16:56:11 2018 -0500
Merge branch 'maint-0.3.3' into release-0.3.3
changes/bug24104 | 4 ++
src/or/rephist.c | 7 ++-
src/or/rephist.h | 5 +-
src/or/router.c | 25 +++++++--
src/test/log_test_helpers.c | 23 +++++++-
src/test/log_test_helpers.h | 8 ++-
src/test/test_router.c | 124 +++++++++++++++++++++++++++++++++++++++++++-
7 files changed, 179 insertions(+), 17 deletions(-)
More information about the tor-commits
mailing list