[tor-commits] [tor/master] Merge branch 'bug30781_035' into bug30781_040

[nickm at torproject.org]

commit fb3f461406d9d22da3ce0b602409c6610b8bb4f7
Merge: 6a6f7eb67 c8c2e2b8f
Author: teor <teor at torproject.org>
Date:   Thu Jun 6 09:56:50 2019 +1000

    Merge branch 'bug30781_035' into bug30781_040

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