[tor-commits] [tor/master] Merge branch 'ticket22029_attempt_squashed'
nickm at torproject.org
nickm at torproject.org
Thu Jan 9 20:50:16 UTC 2020
commit 93894fb770afbbea9850e850ff9e1bb23d7cc4e1
Merge: e45810113 686c5e90a
Author: Nick Mathewson <nickm at torproject.org>
Date: Thu Jan 9 15:27:32 2020 -0500
Merge branch 'ticket22029_attempt_squashed'
changes/bug22029 | 5 +
doc/tor.1.txt | 15 +-
src/feature/dirauth/process_descs.c | 197 +++++++++++++++--------
src/feature/dirauth/process_descs.h | 55 ++++++-
src/feature/nodelist/routerlist.c | 13 +-
src/feature/relay/router.c | 6 +-
src/test/test_dir.c | 301 ++++++++++++++++++++++++++++++++++++
7 files changed, 515 insertions(+), 77 deletions(-)
More information about the tor-commits
mailing list