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

[dgoulet at torproject.org]

commit 61c6049fa825c0d59872e65defa9c4e0ba63eef2
Merge: b5c565728e 433f526af6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 12 11:36:34 2021 -0500

    Merge branch 'maint-0.4.5' into release-0.4.5

 LICENSE                  | 43 ++++++++++---------------------------------
 changes/geoip-2021-03-12 |  2 +-
 2 files changed, 11 insertions(+), 34 deletions(-)