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

[nickm at torproject.org]

commit 6cc561340456eb8d981e9b197a46c38a41a8e762
Merge: 0b4a0c1a26 433f526af6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 12 11:36:34 2021 -0500

    Merge branch 'maint-0.4.5'

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