[tor-commits] [tor/master] Merge branch 'maint-0.4.4' into maint-0.4.5

[nickm at torproject.org]

commit 433f526af69b9f7de1ef51bb2c4a9188477233c6
Merge: b014866f6a 9f59b6f458
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 12 11:36:34 2021 -0500

    Merge branch 'maint-0.4.4' into maint-0.4.5

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