[tor-commits] [tor/release-0.4.6] Merge remote-tracking branch 'tor-gitlab/mr/295' into release-0.4.5

[dgoulet at torproject.org]

commit 726d62947c56eb13f892e3bb96fd8ee52555b4a9
Merge: 3d03016eb0 56f1cab9c1
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri Feb 12 13:49:43 2021 +0200

    Merge remote-tracking branch 'tor-gitlab/mr/295' into release-0.4.5

 changes/bug40281                     | 6 ++++++
 src/feature/nodelist/networkstatus.c | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)