commit dc8e3cd5ce2affb849ed07db8b4a7788769c5935 Merge: a521c4278 ba83c1e5c Author: teor <teor@torproject.org> Date: Thu Jun 6 09:53:02 2019 +1000 Merge branch 'bug30781_029' into bug30781_034 changes/bug30781 | 4 ++++ src/or/routerparse.c | 3 +++ 2 files changed, 7 insertions(+)