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

[nickm at torproject.org]

commit 9f59b6f458f2322df0bbfa48789c79f6657b4857
Merge: 41796158e6 02230575c4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 12 11:36:34 2021 -0500

    Merge branch 'maint-0.3.5' into maint-0.4.4

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