[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/336'

[nickm at torproject.org]

commit 7d9403b42218596108dfa0e614b79f4217912a90
Merge: f98dbdb069 9f9fed3fd1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 10 16:47:46 2021 -0500

    Merge remote-tracking branch 'tor-gitlab/mr/336'

 changes/ticket40314                     |  4 ++++
 src/feature/nodelist/fmt_routerstatus.c | 13 +++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)