Upgrading Tor to 0.4.3.5 (Reverting Tor 0.4.6.8)

src/Makefile.am

@@ -71,11 +71,8 @@ TOR_LIBS = tor/src/core/libtor-app.a \
     tor/src/lib/libtor-string.a \
     tor/src/lib/libtor-malloc.a \
     tor/src/lib/libtor-version.a \
-    tor/src/lib/libtor-llharden.a \
-    tor/src/lib/libtor-trace.a \
     tor/src/lib/libtor-intmath.a \
 	  tor/src/lib/libtor-ctime.a \
-    tor/src/lib/libtor-metrics.a \
 	tor/src/trunnel/libor-trunnel.a \
 	tor/src/lib/libcurve25519_donna.a \
 	tor/src/ext/ed25519/donna/libed25519_donna.a \

src/Makefile.qt.include

@@ -606,11 +606,8 @@ qt_firo_qt_LDADD += tor/src/core/libtor-app.a \
     tor/src/lib/libtor-string.a \
     tor/src/lib/libtor-malloc.a \
     tor/src/lib/libtor-version.a \
-    tor/src/lib/libtor-llharden.a \
-    tor/src/lib/libtor-trace.a \
     tor/src/lib/libtor-intmath.a \
 	  tor/src/lib/libtor-ctime.a \
-    tor/src/lib/libtor-metrics.a \
 	tor/src/trunnel/libor-trunnel.a \
 	tor/src/lib/libcurve25519_donna.a \
 	tor/src/ext/ed25519/donna/libed25519_donna.a \

src/Makefile.test.include

@@ -229,11 +229,8 @@ test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) tor/src/core/libtor-app.a \
     tor/src/lib/libtor-string.a \
     tor/src/lib/libtor-malloc.a \
     tor/src/lib/libtor-version.a \
-    tor/src/lib/libtor-llharden.a \
-    tor/src/lib/libtor-trace.a \
     tor/src/lib/libtor-intmath.a \
 	  tor/src/lib/libtor-ctime.a \
-    tor/src/lib/libtor-metrics.a \
 	tor/src/trunnel/libor-trunnel.a \
 	tor/src/lib/libcurve25519_donna.a \
 	tor/src/ext/ed25519/donna/libed25519_donna.a \

src/tor/Doxyfile.in

@@ -863,8 +863,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = ./src/ext/ed25519 \
-                         ./src/ext/rust \
+EXCLUDE                = ./src/ext \
                          ./src/trunnel \
                          ./src/test \
                          ./src/rust/registry

src/tor/LICENSE

@@ -187,16 +187,39 @@ getdelim.c is distributed under this license:
  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/
-
+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.
 ===============================================================================
 m4/pc_from_ucontext.m4 is available under the following license.  Note that
 it is *not* built into the Tor software.