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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.5' into release-0.3.5

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