commit ab74c3560a423227fff337b1033716920920603b Merge: 0891a31ad fb0e8966f Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 17 18:54:05 2019 -0400
Merge branch 'ticket31552_041' into maint-0.4.1
changes/bug31552 | 5 +++ src/feature/dirauth/keypin.h | 18 ++++++++- src/feature/dirauth/process_descs.h | 81 +++++++++++++++++++++++++++++++++++-- src/feature/dirauth/reachability.h | 31 ++++++++++++-- 4 files changed, 125 insertions(+), 10 deletions(-)