commit 654769bcec3e98bea5e3ac48b2aabffcbe55375e Merge: 1ba2bd359 c8c2e2b8f Author: teor teor@torproject.org Date: Fri Aug 9 14:05:26 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5

changes/bug30781 | 4 ++++ src/feature/dirparse/routerparse.c | 3 +++ 2 files changed, 7 insertions(+)