[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'tor-github/pr/1078' into maint-0.2.9

[teor at torproject.org]

commit 254c1bac453fdb7d3e29a5cde9757542990a6989
Merge: e07d08a16 ba83c1e5c
Author: teor <teor at torproject.org>
Date:   Sat Aug 10 07:21:56 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1078' into maint-0.2.9

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