upgrade tor to v0.4.6.10

ChangeLog

@@ -1,3 +1,28 @@
+Changes in version 0.4.6.10 - 2022-02-04
+  This version contains minor bugfixes but one in particular is that relays
+  don't advertise onion service v2 support at the protocol version level.
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories generated on February 04, 2022.
+
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2022/02/04.
+
+  o Minor bugfix (logging):
+    - Update a log notice dead URL to a working one. Fixes bug 40544;
+      bugfix on 0.3.5.1-alpha.
+
+  o Minor bugfix (relay):
+    - Remove the HSDir and HSIntro onion service v2 protocol versions so
+      relay stop advertising that they support them. Fixes bug 40509;
+      bugfix on 0.3.5.17.
+
+  o Minor bugfixes (MetricsPort, Prometheus):
+    - Add double quotes to the label values of the onion service
+      metrics. Fixes bug 40552; bugfix on 0.4.5.1-alpha.
+
+
 Changes in version 0.4.6.9 - 2021-12-15
   This version fixes several bugs from earlier versions of Tor. One important
   piece is the removal of DNS timeout metric from the overload general signal.

ReleaseNotes

@@ -2,9 +2,36 @@ This document summarizes new features and bugfixes in each stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
-INSERT SUMMARY BLURP
+Changes in version 0.4.6.10 - 2022-02-04
+  This version contains minor bugfixes but one in particular is that relays
+  don't advertise onion service v2 support at the protocol version level.
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories generated on February 04, 2022.
+
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2022/02/04.
+
+  o Minor bugfix (logging):
+    - Update a log notice dead URL to a working one. Fixes bug 40544;
+      bugfix on 0.3.5.1-alpha.
+
+  o Minor bugfix (relay):
+    - Remove the HSDir and HSIntro onion service v2 protocol versions so
+      relay stop advertising that they support them. Fixes bug 40509;
+      bugfix on 0.3.5.17.
+
+  o Minor bugfixes (MetricsPort, Prometheus):
+    - Add double quotes to the label values of the onion service
+      metrics. Fixes bug 40552; bugfix on 0.4.5.1-alpha.
+
 
 Changes in version 0.4.6.9 - 2021-12-15
+  This version fixes several bugs from earlier versions of Tor. One important
+  piece is the removal of DNS timeout metric from the overload general signal.
+  See below for more details.
+
   o Major bugfixes (relay, overload):
     - Don't make Tor DNS timeout trigger an overload general state.
       These timeouts are different from DNS server timeout. They have to

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tor 0.4.6.9.
+# Generated by GNU Autoconf 2.69 for tor 0.4.6.10.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='tor'
 PACKAGE_TARNAME='tor'
-PACKAGE_VERSION='0.4.6.9'
-PACKAGE_STRING='tor 0.4.6.9'
+PACKAGE_VERSION='0.4.6.10'
+PACKAGE_STRING='tor 0.4.6.10'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1487,7 +1487,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures tor 0.4.6.9 to adapt to many kinds of systems.
+\`configure' configures tor 0.4.6.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1557,7 +1557,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tor 0.4.6.9:";;
+     short | recursive ) echo "Configuration of tor 0.4.6.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1784,7 +1784,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tor configure 0.4.6.9
+tor configure 0.4.6.10
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2489,7 +2489,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tor $as_me 0.4.6.9, which was
+It was created by tor $as_me 0.4.6.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2855,7 +2855,7 @@ _ACEOF
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
 
-$as_echo "#define APPROX_RELEASE_DATE \"2021-12-15\"" >>confdefs.h
+$as_echo "#define APPROX_RELEASE_DATE \"2022-02-04\"" >>confdefs.h
 
 
 # "foreign" means we don't follow GNU package layout standards
@@ -3376,7 +3376,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tor'
- VERSION='0.4.6.9'
+ VERSION='0.4.6.10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -29894,7 +29894,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by tor $as_me 0.4.6.9, which was
+This file was extended by tor $as_me 0.4.6.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29960,7 +29960,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-tor config.status 0.4.6.9
+tor config.status 0.4.6.10
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.6.9])
+AC_INIT([tor],[0.4.6.10])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-12-15"], # for 0.4.6.9
+AC_DEFINE(APPROX_RELEASE_DATE, ["2022-02-04"], # for 0.4.6.10
           [Approximate date when this software was released. (Updated when the version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards

contrib/win32build/tor-mingw.nsi.in

@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.6.9"
+!define VERSION "0.4.6.10"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"

doc/man/tor-gencert.1.in

@@ -2,12 +2,12 @@
 .\"     Title: tor-gencert
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 12/16/2021
+.\"      Date: 02/04/2022
 .\"    Manual: Tor Manual
 .\"    Source: Tor
 .\"  Language: English
 .\"
-.TH "TOR\-GENCERT" "1" "12/16/2021" "Tor" "Tor Manual"
+.TH "TOR\-GENCERT" "1" "02/04/2022" "Tor" "Tor Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

doc/man/tor-print-ed-signing-cert.1.in

@@ -2,12 +2,12 @@
 .\"     Title: tor-print-ed-signing-cert
 .\"    Author: Tor Project, Inc.
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 12/16/2021
+.\"      Date: 02/04/2022
 .\"    Manual: Tor Manual
 .\"    Source: Tor
 .\"  Language: English
 .\"
-.TH "TOR\-PRINT\-ED\-SIGN" "1" "12/16/2021" "Tor" "Tor Manual"
+.TH "TOR\-PRINT\-ED\-SIGN" "1" "02/04/2022" "Tor" "Tor Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

doc/man/tor-resolve.1.in

@@ -2,12 +2,12 @@
 .\"     Title: tor-resolve
 .\"    Author: Peter Palfrader
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 12/16/2021
+.\"      Date: 02/04/2022
 .\"    Manual: Tor Manual
 .\"    Source: Tor
 .\"  Language: English
 .\"
-.TH "TOR\-RESOLVE" "1" "12/16/2021" "Tor" "Tor Manual"
+.TH "TOR\-RESOLVE" "1" "02/04/2022" "Tor" "Tor Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

doc/man/tor.1.in

@@ -2,12 +2,12 @@
 .\"     Title: tor
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 12/16/2021
+.\"      Date: 02/04/2022
 .\"    Manual: Tor Manual
 .\"    Source: Tor
 .\"  Language: English
 .\"
-.TH "TOR" "1" "12/16/2021" "Tor" "Tor Manual"
+.TH "TOR" "1" "02/04/2022" "Tor" "Tor Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

doc/man/torify.1.in

@@ -2,12 +2,12 @@
 .\"     Title: torify
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 12/16/2021
+.\"      Date: 02/04/2022
 .\"    Manual: Tor Manual
 .\"    Source: Tor
 .\"  Language: English
 .\"
-.TH "TORIFY" "1" "12/16/2021" "Tor" "Tor Manual"
+.TH "TORIFY" "1" "02/04/2022" "Tor" "Tor Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

orconfig.h.in

@@ -6,7 +6,7 @@
 /* All assert failures are fatal */
 #undef ALL_BUGS_ARE_FATAL
 
-/* # for 0.4.6.9 Approximate date when this software was released. (Updated
+/* # for 0.4.6.10 Approximate date when this software was released. (Updated
    when the version changes.) */
 #undef APPROX_RELEASE_DATE