commit b58e5091b7f442568a10e949fec4ee901c809b12 Merge: d8d36c7dc ef00b1ce0 Author: teor teor@torproject.org Date: Fri Nov 15 12:11:22 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1533'

changes/ticket32163 | 3 +++ src/feature/dirauth/reachability.h | 31 +++++++++++-------------------- src/feature/nodelist/routerlist.c | 2 -- 3 files changed, 14 insertions(+), 22 deletions(-)