[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.5' into release-0.4.5

[dgoulet at torproject.org]

commit 9e33aa878f091248ee5ec9da9d7d0d9fa216b965
Merge: 1f7876ff7e 4cbd22f1a7
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri Jan 22 00:21:21 2021 +0200

    Merge branch 'maint-0.4.5' into release-0.4.5

 changes/bug40238                   |  3 +++
 src/feature/dirparse/routerparse.c | 11 +++++++++++
 2 files changed, 14 insertions(+)