[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 Nov 15 21:47:30 UTC 2018
commit ea890d7def3c3058f2aad7243118e80b5fa794df
Merge: 7651775b8 8569166c7
Author: Nick Mathewson <nickm at torproject.org>
Date: Thu Nov 15 16:45:30 2018 -0500
Merge branch 'maint-0.2.9' into release-0.2.9
changes/bug24104 | 4 ++
src/or/rephist.c | 6 +-
src/or/rephist.h | 4 +-
src/or/router.c | 25 ++++++--
src/test/include.am | 1 +
src/test/log_test_helpers.c | 22 ++++++-
src/test/log_test_helpers.h | 7 ++-
src/test/test.c | 1 +
src/test/test_router.c | 142 ++++++++++++++++++++++++++++++++++++++++++++
9 files changed, 200 insertions(+), 12 deletions(-)
More information about the tor-commits
mailing list