commit ece35992aca666cacbebf85686609fba923fb371 Merge: 6c3f339f0 ab74c3560 Author: Nick Mathewson <ni...@torproject.org> Date: Tue Sep 17 18:55:18 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31552 | 5 +++ changes/bug31696 | 5 +++ src/feature/dirauth/keypin.h | 18 ++++++++- src/feature/dirauth/process_descs.h | 81 +++++++++++++++++++++++++++++++++++-- src/feature/dirauth/reachability.h | 31 ++++++++++++-- src/lib/malloc/map_anon.c | 24 +++++++++-- 6 files changed, 151 insertions(+), 13 deletions(-) _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits