Merge branch 'maint-0.3.5' into maint-0.4.4

 POSSIBILITY OF SUCH DAMAGE.

===============================================================================

src/config/geoip is licensed under the following license:

OPEN DATA LICENSE (GeoLite Country and GeoLite City databases)

Copyright (c) 2008 MaxMind, Inc.  All Rights Reserved.

All advertising materials and documentation mentioning features or use of

this database must display the following acknowledgment:

"This product includes GeoLite data created by MaxMind, available from

http://maxmind.com/"

Redistribution and use with or without modification, are permitted provided

that the following conditions are met:

1. Redistributions must retain the above copyright notice, this list of

conditions and the following disclaimer in the documentation and/or other

materials provided with the distribution.

2. All advertising materials and documentation mentioning features or use of

this database must display the following acknowledgement:

"This product includes GeoLite data created by MaxMind, available from

http://maxmind.com/"

3. "MaxMind" may not be used to endorse or promote products derived from this

database without specific prior written permission.

THIS DATABASE IS PROVIDED BY MAXMIND, INC ``AS IS'' AND ANY

EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

DISCLAIMED. IN NO EVENT SHALL MAXMIND BE LIABLE FOR ANY

DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

src/config/geoip and src/config/geoip6:

These files are based on the IPFire Location Database. For more

information, see https://location.ipfire.org/.

The data is distributed under a creative commons "BY-SA 4.0" license.

Find the full license terms at:

     https://creativecommons.org/licenses/by-sa/4.0/

===============================================================================

m4/pc_from_ucontext.m4 is available under the following license.  Note that

it is *not* built into the Tor software.

      Database instead.  (See https://location.ipfire.org/ for more

      information).  This release updates our geoip files to match the

      IPFire Location Database as retrieved on 2021/03/12.  Closes

      ticket 32978.

      ticket 40224.