diff --git a/ChangeLog b/ChangeLog
index 6411324..e1fe316 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,62 @@
+Changes in version 0.4.6.8 - 2021-10-26
+  This version fixes several bugs from earlier versions of Tor. One
+  highlight is a fix on how we track DNS timeouts to report general
+  relay overload.
+
+  o Major bugfixes (relay, overload state):
+    - Relays report the general overload state for DNS timeout errors
+      only if X% of all DNS queries over Y seconds are errors. Before
+      that, it only took 1 timeout to report the overload state which
+      was just too low of a threshold. The X and Y values are 1% and 10
+      minutes respectively but they are also controlled by consensus
+      parameters. Fixes bug 40491; bugfix on 0.4.6.1-alpha.
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories for October 2021. Closes
+      ticket 40493.
+
+  o Minor features (testing):
+    - On a testing network, relays can now use the
+      TestingMinTimeToReportBandwidth option to change the smallest
+      amount of time over which they're willing to report their observed
+      maximum bandwidth. Previously, this was fixed at 1 day. For
+      safety, values under 2 hours are only supported on testing
+      networks. Part of a fix for ticket 40337.
+    - Relays on testing networks no longer rate-limit how frequently
+      they are willing to report new bandwidth measurements. Part of a
+      fix for ticket 40337.
+    - Relays on testing networks now report their observed bandwidths
+      immediately from startup. Previously, they waited until they had
+      been running for a full day. Closes ticket 40337.
+
+  o Minor bugfix (onion service):
+    - Do not flag an HSDir as non-running in case the descriptor upload
+      or fetch fails. An onion service closes pending directory
+      connections before uploading a new descriptor which can thus lead
+      to wrongly flagging many relays and thus affecting circuit building
+      path selection. Fixes bug 40434; bugfix on 0.2.0.13-alpha.
+    - Improve logging when a bad HS version is given. Fixes bug 40476;
+      bugfix on 0.4.6.1-alpha.
+
+  o Minor bugfix (CI, onion service):
+    - Exclude onion service version 2 Stem tests in our CI. Fixes bug 40500;
+      bugfix on 0.3.2.1-alpha.
+
+  o Minor bugfixes (compatibility):
+    - Fix compatibility with the most recent Libevent versions, which no
+      longer have an evdns_set_random_bytes() function. Because this
+      function has been a no-op since Libevent 2.0.4-alpha, it is safe
+      for us to just stop calling it. Fixes bug 40371; bugfix
+      on 0.2.1.7-alpha.
+
+  o Minor bugfixes (onion service, TROVE-2021-008):
+    - Only log v2 access attempts once total, in order to not pollute
+      the logs with warnings and to avoid recording the times on disk
+      when v2 access was attempted. Note that the onion address was
+      _never_ logged. This counts as a Low-severity security issue.
+      Fixes bug 40474; bugfix on 0.4.5.8.
+
+
 Changes in version 0.4.6.7 - 2021-08-16
   This version fixes several bugs from earlier versions of Tor,
   including one that could lead to a denial-of-service attack. Everyone
diff --git a/Makefile.in b/Makefile.in
index e7c2a7a..dd47692 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -4488,9 +4488,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
 AM_RECURSIVE_TARGETS = cscope check recheck
 am__tty_colors_dummy = \
   mgn= red= grn= lgn= blu= brg= std=; \
@@ -4647,6 +4644,7 @@ am__set_TESTS_bases = \
   bases='$(TEST_LOGS)'; \
   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
   bases=`echo $$bases`
+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
 RECHECK_LOGS = $(TEST_LOGS)
 TEST_SUITE_LOG = test-suite.log
 TEST_EXTENSIONS = @EXEEXT@ .test
@@ -4768,6 +4766,8 @@ am__post_remove_distdir = $(am__remove_distdir)
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 DIST_TARGETS = dist-gzip
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -4794,6 +4794,8 @@ CFLAGS_CONSTTIME = @CFLAGS_CONSTTIME@
 CONFDIR = @CONFDIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURVE25519_LIBS = @CURVE25519_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -4804,6 +4806,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 F_OMIT_FRAME_POINTER = @F_OMIT_FRAME_POINTER@
 GREP = @GREP@
@@ -21859,7 +21862,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
 	fi;								\
 	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
 	echo "$${col}$$br$${std}"; 					\
 	create_testsuite_report --maybe-color;				\
 	echo "$$col$$br$$std";						\
@@ -22145,7 +22148,6 @@ scripts/maint/checkSpaceTest.sh.log: scripts/maint/checkSpaceTest.sh
 @am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
 @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
@@ -22267,7 +22269,7 @@ distcheck: dist
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
diff --git a/README b/README
new file mode 100644
index 0000000..397f6b9
--- /dev/null
+++ b/README
@@ -0,0 +1,31 @@
+Tor protects your privacy on the internet by hiding the connection
+between your Internet address and the services you use. We believe Tor
+is reasonably secure, but please ensure you read the instructions and
+configure it properly.
+
+To build Tor from source:
+        ./configure && make && make install
+
+To build Tor from a just-cloned git repository:
+        sh autogen.sh && ./configure && make && make install
+
+Home page:
+        https://www.torproject.org/
+
+Download new versions:
+        https://www.torproject.org/download/download.html
+
+Documentation, including links to installation and setup instructions:
+        https://www.torproject.org/docs/documentation.html
+
+Making applications work with Tor:
+        https://gitlab.torproject.org/legacy/trac/-/wikis/doc/TorifyHOWTO
+
+Frequently Asked Questions:
+        https://www.torproject.org/docs/faq.html
+
+Release timeline:
+        https://gitlab.torproject.org/tpo/core/team/-/wikis/NetworkTeam/CoreTorReleases
+
+To get started working on Tor development:
+        See the doc/HACKING directory.
diff --git a/ReleaseNotes b/ReleaseNotes
index aa54953..483012e 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,65 @@ 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.
 
+Changes in version 0.4.6.8 - 2021-10-26
+  This version fixes several bugs from earlier versions of Tor. One
+  highlight is a fix on how we track DNS timeouts to report general
+  relay overload.
+
+  o Major bugfixes (relay, overload state):
+    - Relays report the general overload state for DNS timeout errors
+      only if X% of all DNS queries over Y seconds are errors. Before
+      that, it only took 1 timeout to report the overload state which
+      was just too low of a threshold. The X and Y values are 1% and 10
+      minutes respectively but they are also controlled by consensus
+      parameters. Fixes bug 40491; bugfix on 0.4.6.1-alpha.
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories for October 2021. Closes
+      ticket 40493.
+
+  o Minor features (testing):
+    - On a testing network, relays can now use the
+      TestingMinTimeToReportBandwidth option to change the smallest
+      amount of time over which they're willing to report their observed
+      maximum bandwidth. Previously, this was fixed at 1 day. For
+      safety, values under 2 hours are only supported on testing
+      networks. Part of a fix for ticket 40337.
+    - Relays on testing networks no longer rate-limit how frequently
+      they are willing to report new bandwidth measurements. Part of a
+      fix for ticket 40337.
+    - Relays on testing networks now report their observed bandwidths
+      immediately from startup. Previously, they waited until they had
+      been running for a full day. Closes ticket 40337.
+
+  o Minor bugfix (onion service):
+    - Do not flag an HSDir as non-running in case the descriptor upload
+      or fetch fails. An onion service closes pending directory
+      connections before uploading a new descriptor which can thus lead
+      to wrongly flagging many relays and thus affecting circuit building
+      path selection. Fixes bug 40434; bugfix on 0.2.0.13-alpha.
+    - Improve logging when a bad HS version is given. Fixes bug 40476;
+      bugfix on 0.4.6.1-alpha.
+
+  o Minor bugfix (CI, onion service):
+    - Exclude onion service version 2 Stem tests in our CI. Fixes bug 40500;
+      bugfix on 0.3.2.1-alpha.
+
+  o Minor bugfixes (compatibility):
+    - Fix compatibility with the most recent Libevent versions, which no
+      longer have an evdns_set_random_bytes() function. Because this
+      function has been a no-op since Libevent 2.0.4-alpha, it is safe
+      for us to just stop calling it. Fixes bug 40371; bugfix
+      on 0.2.1.7-alpha.
+
+  o Minor bugfixes (onion service, TROVE-2021-008):
+    - Only log v2 access attempts once total, in order to not pollute
+      the logs with warnings and to avoid recording the times on disk
+      when v2 access was attempted. Note that the onion address was
+      _never_ logged. This counts as a Low-severity security issue.
+      Fixes bug 40474; bugfix on 0.4.5.8.
+
+
 Changes in version 0.4.6.7 - 2021-08-16
   This version fixes several bugs from earlier versions of Tor, including one
   that could lead to a denial-of-service attack. Everyone running an earlier
diff --git a/aclocal.m4 b/aclocal.m4
index 8400242..0ed26fe 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.4 -*- Autoconf -*-
 
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.16.2], [],
+m4_if([$1], [1.16.4], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,12 +51,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.2])dnl
+[AM_AUTOMAKE_VERSION([1.16.4])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -118,7 +118,7 @@ AC_SUBST([AR])dnl
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -170,7 +170,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 # AM_COND_IF                                            -*- Autoconf -*-
 
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -207,7 +207,7 @@ fi[]dnl
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -238,7 +238,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -429,7 +429,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -497,7 +497,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -561,7 +561,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
 m4_if(
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
   [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
@@ -613,6 +613,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
 		  [m4_define([AC_PROG_OBJCXX],
 			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+AC_SUBST([CTAGS])
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+AC_SUBST([ETAGS])
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+AC_SUBST([CSCOPE])
+
 AC_REQUIRE([AM_SILENT_RULES])dnl
 dnl The testsuite driver may need to know about EXEEXT, so add the
 dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
@@ -694,7 +708,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -715,7 +729,7 @@ if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -736,7 +750,7 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -779,7 +793,7 @@ AC_SUBST([am__quote])])
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -800,12 +814,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
 if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
@@ -818,7 +827,7 @@ fi
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -847,7 +856,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -894,7 +903,7 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -913,7 +922,7 @@ AC_DEFUN([AM_RUN_LOG],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -994,7 +1003,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1054,7 +1063,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1082,7 +1091,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1101,7 +1110,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/config.guess b/config.guess
index b33c9e8..f50dcdb 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-08-29'
+timestamp='2018-02-24'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -84,6 +84,8 @@ if test $# != 0; then
   exit 1
 fi
 
+trap 'exit 1' 1 2 15
+
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
 # temporary files to be created and, as you can see below, it is a
@@ -94,39 +96,34 @@ fi
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-tmp=
-# shellcheck disable=SC2172
-trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
-trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
-
-set_cc_for_build() {
-    : "${TMPDIR=/tmp}"
-    # shellcheck disable=SC2039
-    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
-	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
-    dummy=$tmp/dummy
-    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
-	,,)    echo "int x;" > "$dummy.c"
-	       for driver in cc gcc c89 c99 ; do
-		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
-		       CC_FOR_BUILD="$driver"
-		       break
-		   fi
-	       done
-	       if test x"$CC_FOR_BUILD" = x ; then
-		   CC_FOR_BUILD=no_compiler_found
-	       fi
-	       ;;
-	,,*)   CC_FOR_BUILD=$CC ;;
-	,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-    esac
-}
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > "$dummy.c" ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
-if test -f /.attbin/uname ; then
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
 
@@ -141,7 +138,7 @@ Linux|GNU|GNU/*)
 	# We could probably try harder.
 	LIBC=gnu
 
-	set_cc_for_build
+	eval "$set_cc_for_build"
 	cat <<-EOF > "$dummy.c"
 	#include <features.h>
 	#if defined(__UCLIBC__)
@@ -202,7 +199,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 		os=netbsdelf
 		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		set_cc_for_build
+		eval "$set_cc_for_build"
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
 		then
@@ -240,7 +237,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "$machine-${os}${release}${abi-}"
+	echo "$machine-${os}${release}${abi}"
 	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -392,15 +389,20 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	echo i386-pc-auroraux"$UNAME_RELEASE"
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
-	case `isainfo -b` in
-	    32)
-		echo i386-pc-solaris2"$UNAME_REL"
-		;;
-	    64)
-		echo x86_64-pc-solaris2"$UNAME_REL"
-		;;
-	esac
+	eval "$set_cc_for_build"
+	SUN_ARCH=i386
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH=x86_64
+	    fi
+	fi
+	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -480,7 +482,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	echo clipper-intergraph-clix"$UNAME_RELEASE"
 	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-	set_cc_for_build
+	eval "$set_cc_for_build"
 	sed 's/^	//' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -577,7 +579,7 @@ EOF
 	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		set_cc_for_build
+		eval "$set_cc_for_build"
 		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
@@ -658,7 +660,7 @@ EOF
 		    esac
 		fi
 		if [ "$HP_ARCH" = "" ]; then
-		    set_cc_for_build
+		    eval "$set_cc_for_build"
 		    sed 's/^		//' << EOF > "$dummy.c"
 
 		#define _HPUX_SOURCE
@@ -698,7 +700,7 @@ EOF
 	esac
 	if [ "$HP_ARCH" = hppa2.0w ]
 	then
-	    set_cc_for_build
+	    eval "$set_cc_for_build"
 
 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@@ -724,7 +726,7 @@ EOF
 	echo ia64-hp-hpux"$HPUX_REV"
 	exit ;;
     3050*:HI-UX:*:*)
-	set_cc_for_build
+	eval "$set_cc_for_build"
 	sed 's/^	//' << EOF > "$dummy.c"
 	#include <unistd.h>
 	int
@@ -838,17 +840,6 @@ EOF
     *:BSD/OS:*:*)
 	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
 	exit ;;
-    arm:FreeBSD:*:*)
-	UNAME_PROCESSOR=`uname -p`
-	set_cc_for_build
-	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_PCS_VFP
-	then
-	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
-	else
-	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
-	fi
-	exit ;;
     *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case "$UNAME_PROCESSOR" in
@@ -903,8 +894,8 @@ EOF
 	# other systems with GNU libc and userland
 	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
 	exit ;;
-    *:Minix:*:*)
-	echo "$UNAME_MACHINE"-unknown-minix
+    i*86:Minix:*:*)
+	echo "$UNAME_MACHINE"-pc-minix
 	exit ;;
     aarch64:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -931,7 +922,7 @@ EOF
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     arm*:Linux:*:*)
-	set_cc_for_build
+	eval "$set_cc_for_build"
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
@@ -980,7 +971,7 @@ EOF
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
-	set_cc_for_build
+	eval "$set_cc_for_build"
 	sed 's/^	//' << EOF > "$dummy.c"
 	#undef CPU
 	#undef ${UNAME_MACHINE}
@@ -1055,7 +1046,11 @@ EOF
 	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
 	exit ;;
     x86_64:Linux:*:*)
-	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	if objdump -f /bin/sh | grep -q elf32-x86-64; then
+	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
+	else
+	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	fi
 	exit ;;
     xtensa*:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -1294,7 +1289,7 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	set_cc_for_build
+	eval "$set_cc_for_build"
 	if test "$UNAME_PROCESSOR" = unknown ; then
 	    UNAME_PROCESSOR=powerpc
 	fi
@@ -1367,7 +1362,6 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	# shellcheck disable=SC2154
 	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
@@ -1479,7 +1473,7 @@ EOF
 exit 1
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
diff --git a/config.sub b/config.sub
index b51fb8c..1d8e98b 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-08-29'
+timestamp='2018-02-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -110,1159 +110,1223 @@ case $# in
     exit 1;;
 esac
 
-# Split fields of configuration type
-IFS="-" read -r field1 field2 field3 field4 <<EOF
-$1
-EOF
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
+    if [ "$basic_machine" != "$1" ]
+    then os=`echo "$1" | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
 
-# Separate into logical components for further validation
-case $1 in
-	*-*-*-*-*)
-		echo Invalid configuration \`"$1"\': more than four components >&2
-		exit 1
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
 		;;
-	*-*-*-*)
-		basic_machine=$field1-$field2
-		os=$field3-$field4
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze*)
+		os=
+		basic_machine=$1
 		;;
-	*-*-*)
-		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
-		# parts
-		maybe_os=$field2-$field3
-		case $maybe_os in
-			nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
-			| linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
-			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
-			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
-			| storm-chaos* | os2-emx* | rtmk-nova*)
-				basic_machine=$field1
-				os=$maybe_os
-				;;
-			android-linux)
-				basic_machine=$field1-unknown
-				os=linux-android
-				;;
-			*)
-				basic_machine=$field1-$field2
-				os=$field3
-				;;
-		esac
+	-bluegene*)
+		os=-cnk
 		;;
-	*-*)
-		# A lone config we happen to match not fitting any patern
-		case $field1-$field2 in
-			decstation-3100)
-				basic_machine=mips-dec
-				os=
-				;;
-			*-*)
-				# Second component is usually, but not always the OS
-				case $field2 in
-					# Prevent following clause from handling this valid os
-					sun*os*)
-						basic_machine=$field1
-						os=$field2
-						;;
-					# Manufacturers
-					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
-					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
-					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
-					| convergent* | ncr* | news | 32* | 3600* | 3100* \
-					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
-					| ultra | tti* | harris | dolphin | highlevel | gould \
-					| cbm | ns | masscomp | apple | axis | knuth | cray \
-					| microblaze* | sim | cisco \
-					| oki | wec | wrs | winbond)
-						basic_machine=$field1-$field2
-						os=
-						;;
-					*)
-						basic_machine=$field1
-						os=$field2
-						;;
-				esac
-			;;
-		esac
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
 		;;
-	*)
-		# Convert single-component short-hands not valid as part of
-		# multi-component configurations.
-		case $field1 in
-			386bsd)
-				basic_machine=i386-pc
-				os=bsd
-				;;
-			a29khif)
-				basic_machine=a29k-amd
-				os=udi
-				;;
-			adobe68k)
-				basic_machine=m68010-adobe
-				os=scout
-				;;
-			alliant)
-				basic_machine=fx80-alliant
-				os=
-				;;
-			altos | altos3068)
-				basic_machine=m68k-altos
-				os=
-				;;
-			am29k)
-				basic_machine=a29k-none
-				os=bsd
-				;;
-			amdahl)
-				basic_machine=580-amdahl
-				os=sysv
-				;;
-			amiga)
-				basic_machine=m68k-unknown
-				os=
-				;;
-			amigaos | amigados)
-				basic_machine=m68k-unknown
-				os=amigaos
-				;;
-			amigaunix | amix)
-				basic_machine=m68k-unknown
-				os=sysv4
-				;;
-			apollo68)
-				basic_machine=m68k-apollo
-				os=sysv
-				;;
-			apollo68bsd)
-				basic_machine=m68k-apollo
-				os=bsd
-				;;
-			aros)
-				basic_machine=i386-pc
-				os=aros
-				;;
-			aux)
-				basic_machine=m68k-apple
-				os=aux
-				;;
-			balance)
-				basic_machine=ns32k-sequent
-				os=dynix
-				;;
-			blackfin)
-				basic_machine=bfin-unknown
-				os=linux
-				;;
-			cegcc)
-				basic_machine=arm-unknown
-				os=cegcc
-				;;
-			convex-c1)
-				basic_machine=c1-convex
-				os=bsd
-				;;
-			convex-c2)
-				basic_machine=c2-convex
-				os=bsd
-				;;
-			convex-c32)
-				basic_machine=c32-convex
-				os=bsd
-				;;
-			convex-c34)
-				basic_machine=c34-convex
-				os=bsd
-				;;
-			convex-c38)
-				basic_machine=c38-convex
-				os=bsd
-				;;
-			cray)
-				basic_machine=j90-cray
-				os=unicos
-				;;
-			crds | unos)
-				basic_machine=m68k-crds
-				os=
-				;;
-			da30)
-				basic_machine=m68k-da30
-				os=
-				;;
-			decstation | pmax | pmin | dec3100 | decstatn)
-				basic_machine=mips-dec
-				os=
-				;;
-			delta88)
-				basic_machine=m88k-motorola
-				os=sysv3
-				;;
-			dicos)
-				basic_machine=i686-pc
-				os=dicos
-				;;
-			djgpp)
-				basic_machine=i586-pc
-				os=msdosdjgpp
-				;;
-			ebmon29k)
-				basic_machine=a29k-amd
-				os=ebmon
-				;;
-			es1800 | OSE68k | ose68k | ose | OSE)
-				basic_machine=m68k-ericsson
-				os=ose
-				;;
-			gmicro)
-				basic_machine=tron-gmicro
-				os=sysv
-				;;
-			go32)
-				basic_machine=i386-pc
-				os=go32
-				;;
-			h8300hms)
-				basic_machine=h8300-hitachi
-				os=hms
-				;;
-			h8300xray)
-				basic_machine=h8300-hitachi
-				os=xray
-				;;
-			h8500hms)
-				basic_machine=h8500-hitachi
-				os=hms
-				;;
-			harris)
-				basic_machine=m88k-harris
-				os=sysv3
-				;;
-			hp300)
-				basic_machine=m68k-hp
-				;;
-			hp300bsd)
-				basic_machine=m68k-hp
-				os=bsd
-				;;
-			hp300hpux)
-				basic_machine=m68k-hp
-				os=hpux
-				;;
-			hppaosf)
-				basic_machine=hppa1.1-hp
-				os=osf
-				;;
-			hppro)
-				basic_machine=hppa1.1-hp
-				os=proelf
-				;;
-			i386mach)
-				basic_machine=i386-mach
-				os=mach
-				;;
-			vsta)
-				basic_machine=i386-pc
-				os=vsta
-				;;
-			isi68 | isi)
-				basic_machine=m68k-isi
-				os=sysv
-				;;
-			m68knommu)
-				basic_machine=m68k-unknown
-				os=linux
-				;;
-			magnum | m3230)
-				basic_machine=mips-mips
-				os=sysv
-				;;
-			merlin)
-				basic_machine=ns32k-utek
-				os=sysv
-				;;
-			mingw64)
-				basic_machine=x86_64-pc
-				os=mingw64
-				;;
-			mingw32)
-				basic_machine=i686-pc
-				os=mingw32
-				;;
-			mingw32ce)
-				basic_machine=arm-unknown
-				os=mingw32ce
-				;;
-			monitor)
-				basic_machine=m68k-rom68k
-				os=coff
-				;;
-			morphos)
-				basic_machine=powerpc-unknown
-				os=morphos
-				;;
-			moxiebox)
-				basic_machine=moxie-unknown
-				os=moxiebox
-				;;
-			msdos)
-				basic_machine=i386-pc
-				os=msdos
-				;;
-			msys)
-				basic_machine=i686-pc
-				os=msys
-				;;
-			mvs)
-				basic_machine=i370-ibm
-				os=mvs
-				;;
-			nacl)
-				basic_machine=le32-unknown
-				os=nacl
-				;;
-			ncr3000)
-				basic_machine=i486-ncr
-				os=sysv4
-				;;
-			netbsd386)
-				basic_machine=i386-pc
-				os=netbsd
-				;;
-			netwinder)
-				basic_machine=armv4l-rebel
-				os=linux
-				;;
-			news | news700 | news800 | news900)
-				basic_machine=m68k-sony
-				os=newsos
-				;;
-			news1000)
-				basic_machine=m68030-sony
-				os=newsos
-				;;
-			necv70)
-				basic_machine=v70-nec
-				os=sysv
-				;;
-			nh3000)
-				basic_machine=m68k-harris
-				os=cxux
-				;;
-			nh[45]000)
-				basic_machine=m88k-harris
-				os=cxux
-				;;
-			nindy960)
-				basic_machine=i960-intel
-				os=nindy
-				;;
-			mon960)
-				basic_machine=i960-intel
-				os=mon960
-				;;
-			nonstopux)
-				basic_machine=mips-compaq
-				os=nonstopux
-				;;
-			os400)
-				basic_machine=powerpc-ibm
-				os=os400
-				;;
-			OSE68000 | ose68000)
-				basic_machine=m68000-ericsson
-				os=ose
-				;;
-			os68k)
-				basic_machine=m68k-none
-				os=os68k
-				;;
-			paragon)
-				basic_machine=i860-intel
-				os=osf
-				;;
-			parisc)
-				basic_machine=hppa-unknown
-				os=linux
-				;;
-			pw32)
-				basic_machine=i586-unknown
-				os=pw32
-				;;
-			rdos | rdos64)
-				basic_machine=x86_64-pc
-				os=rdos
-				;;
-			rdos32)
-				basic_machine=i386-pc
-				os=rdos
-				;;
-			rom68k)
-				basic_machine=m68k-rom68k
-				os=coff
-				;;
-			sa29200)
-				basic_machine=a29k-amd
-				os=udi
-				;;
-			sei)
-				basic_machine=mips-sei
-				os=seiux
-				;;
-			sequent)
-				basic_machine=i386-sequent
-				os=
-				;;
-			sps7)
-				basic_machine=m68k-bull
-				os=sysv2
-				;;
-			st2000)
-				basic_machine=m68k-tandem
-				os=
-				;;
-			stratus)
-				basic_machine=i860-stratus
-				os=sysv4
-				;;
-			sun2)
-				basic_machine=m68000-sun
-				os=
-				;;
-			sun2os3)
-				basic_machine=m68000-sun
-				os=sunos3
-				;;
-			sun2os4)
-				basic_machine=m68000-sun
-				os=sunos4
-				;;
-			sun3)
-				basic_machine=m68k-sun
-				os=
-				;;
-			sun3os3)
-				basic_machine=m68k-sun
-				os=sunos3
-				;;
-			sun3os4)
-				basic_machine=m68k-sun
-				os=sunos4
-				;;
-			sun4)
-				basic_machine=sparc-sun
-				os=
-				;;
-			sun4os3)
-				basic_machine=sparc-sun
-				os=sunos3
-				;;
-			sun4os4)
-				basic_machine=sparc-sun
-				os=sunos4
-				;;
-			sun4sol2)
-				basic_machine=sparc-sun
-				os=solaris2
-				;;
-			sun386 | sun386i | roadrunner)
-				basic_machine=i386-sun
-				os=
-				;;
-			sv1)
-				basic_machine=sv1-cray
-				os=unicos
-				;;
-			symmetry)
-				basic_machine=i386-sequent
-				os=dynix
-				;;
-			t3e)
-				basic_machine=alphaev5-cray
-				os=unicos
-				;;
-			t90)
-				basic_machine=t90-cray
-				os=unicos
-				;;
-			toad1)
-				basic_machine=pdp10-xkl
-				os=tops20
-				;;
-			tpf)
-				basic_machine=s390x-ibm
-				os=tpf
-				;;
-			udi29k)
-				basic_machine=a29k-amd
-				os=udi
-				;;
-			ultra3)
-				basic_machine=a29k-nyu
-				os=sym1
-				;;
-			v810 | necv810)
-				basic_machine=v810-nec
-				os=none
-				;;
-			vaxv)
-				basic_machine=vax-dec
-				os=sysv
-				;;
-			vms)
-				basic_machine=vax-dec
-				os=vms
-				;;
-			vxworks960)
-				basic_machine=i960-wrs
-				os=vxworks
-				;;
-			vxworks68)
-				basic_machine=m68k-wrs
-				os=vxworks
-				;;
-			vxworks29k)
-				basic_machine=a29k-wrs
-				os=vxworks
-				;;
-			xbox)
-				basic_machine=i686-pc
-				os=mingw32
-				;;
-			ymp)
-				basic_machine=ymp-cray
-				os=unicos
-				;;
-			*)
-				basic_machine=$1
-				os=
-				;;
-		esac
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
 		;;
 esac
 
-# Decode 1-component or ad-hoc basic machines
+# Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
-	# Here we handle the default manufacturer of certain CPU types.  It is in
-	# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		cpu=hppa1.1
-		vendor=winbond
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| ba \
+	| be32 | be64 \
+	| bfin \
+	| c4x | c8051 | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| e2k | epiphany \
+	| fido | fr30 | frv | ft32 \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia16 | ia64 \
+	| ip2k | iq2000 \
+	| k1om \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
+	| ns16k | ns32k \
+	| open8 | or1k | or1knd | or32 \
+	| pdp10 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pru \
+	| pyramid \
+	| riscv32 | riscv64 \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
+	| wasm32 \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
 		;;
-	op50n)
-		cpu=hppa1.1
-		vendor=oki
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
 		;;
-	op60c)
-		cpu=hppa1.1
-		vendor=oki
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
 		;;
-	ibm*)
-		cpu=i370
-		vendor=ibm
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
 		;;
-	orion105)
-		cpu=clipper
-		vendor=highlevel
+	ms1)
+		basic_machine=mt-unknown
 		;;
-	mac | mpw | mac-mpw)
-		cpu=m68k
-		vendor=apple
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
 		;;
-	pmac | pmac-mpw)
-		cpu=powerpc
-		vendor=apple
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
 		;;
 
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| ba-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| e2k-* | elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| k1om-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| or1k*-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pru-* \
+	| pyramid-* \
+	| riscv32-* | riscv64-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| visium-* \
+	| wasm32-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-pc
+		os=-bsd
+		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		cpu=m68000
-		vendor=att
+		basic_machine=m68000-att
 		;;
 	3b*)
-		cpu=we32k
-		vendor=att
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	asmjs)
+		basic_machine=asmjs-unknown
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		os=-linux
 		;;
 	bluegene*)
-		cpu=powerpc
-		vendor=ibm
-		os=cnk
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
 		;;
 	decsystem10* | dec10*)
-		cpu=pdp10
-		vendor=dec
-		os=tops10
+		basic_machine=pdp10-dec
+		os=-tops10
 		;;
 	decsystem20* | dec20*)
-		cpu=pdp10
-		vendor=dec
-		os=tops20
+		basic_machine=pdp10-dec
+		os=-tops20
 		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
-		cpu=m68k
-		vendor=motorola
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
 		;;
 	dpx2*)
-		cpu=m68k
-		vendor=bull
-		os=sysv3
+		basic_machine=m68k-bull
+		os=-sysv3
 		;;
-	encore | umax | mmax)
-		cpu=ns32k
-		vendor=encore
+	e500v[12])
+		basic_machine=powerpc-unknown
+		os=$os"spe"
+		;;
+	e500v[12]-*)
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		os=$os"spe"
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
 		;;
 	elxsi)
-		cpu=elxsi
-		vendor=elxsi
-		os=${os:-bsd}
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
 		;;
 	fx2800)
-		cpu=i860
-		vendor=alliant
+		basic_machine=i860-alliant
 		;;
 	genix)
-		cpu=ns32k
-		vendor=ns
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
 		;;
 	h3050r* | hiux*)
-		cpu=hppa1.1
-		vendor=hitachi
-		os=hiuxwe2
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
 		;;
 	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		cpu=hppa1.0
-		vendor=hp
+		basic_machine=hppa1.0-hp
 		;;
 	hp9k2[0-9][0-9] | hp9k31[0-9])
-		cpu=m68000
-		vendor=hp
+		basic_machine=m68000-hp
 		;;
 	hp9k3[2-9][0-9])
-		cpu=m68k
-		vendor=hp
+		basic_machine=m68k-hp
 		;;
 	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		cpu=hppa1.0
-		vendor=hp
+		basic_machine=hppa1.0-hp
 		;;
 	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		cpu=hppa1.1
-		vendor=hp
+		basic_machine=hppa1.1-hp
 		;;
 	hp9k78[0-9] | hp78[0-9])
 		# FIXME: really hppa2.0-hp
-		cpu=hppa1.1
-		vendor=hp
+		basic_machine=hppa1.1-hp
 		;;
 	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
 		# FIXME: really hppa2.0-hp
-		cpu=hppa1.1
-		vendor=hp
+		basic_machine=hppa1.1-hp
 		;;
 	hp9k8[0-9][13679] | hp8[0-9][13679])
-		cpu=hppa1.1
-		vendor=hp
+		basic_machine=hppa1.1-hp
 		;;
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		cpu=hppa1.0
-		vendor=hp
+		basic_machine=hppa1.0-hp
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
 		;;
 	i*86v32)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		os=sysv32
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
 		;;
 	i*86v4*)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		os=sysv4
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
 		;;
 	i*86v)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		os=sysv
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		os=-sysv
 		;;
 	i*86sol2)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		os=solaris2
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
 		;;
-	j90 | j90-cray)
-		cpu=j90
-		vendor=cray
-		os=${os:-unicos}
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	vsta)
+		basic_machine=i386-unknown
+		os=-vsta
 		;;
 	iris | iris4d)
-		cpu=mips
-		vendor=sgi
+		basic_machine=mips-sgi
 		case $os in
-		    irix*)
+		    -irix*)
 			;;
 		    *)
-			os=irix4
+			os=-irix4
 			;;
 		esac
 		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze*)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
+	mingw32)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
-		cpu=m68000
-		vendor=convergent
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i686-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
 		;;
-	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		cpu=m68k
-		vendor=atari
-		os=mint
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
 		;;
 	news-3600 | risc-news)
-		cpu=mips
-		vendor=sony
-		os=newsos
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
 		;;
 	next | m*-next)
-		cpu=m68k
-		vendor=next
+		basic_machine=m68k-next
 		case $os in
-		    nextstep* )
+		    -nextstep* )
 			;;
-		    ns2*)
-		      os=nextstep2
+		    -ns2*)
+		      os=-nextstep2
 			;;
 		    *)
-		      os=nextstep3
+		      os=-nextstep3
 			;;
 		esac
 		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
 	np1)
-		cpu=np1
-		vendor=gould
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	nsv-tandem)
+		basic_machine=nsv-tandem
+		;;
+	nsx-tandem)
+		basic_machine=nsx-tandem
 		;;
 	op50n-* | op60c-*)
-		cpu=hppa1.1
-		vendor=oki
-		os=proelf
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
 		;;
 	pa-hitachi)
-		cpu=hppa1.1
-		vendor=hitachi
-		os=hiuxwe2
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		os=-linux
 		;;
 	pbd)
-		cpu=sparc
-		vendor=tti
+		basic_machine=sparc-tti
 		;;
 	pbb)
-		cpu=m68k
-		vendor=tti
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
-	pc532)
-		cpu=ns32k
-		vendor=pc532
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pn)
-		cpu=pn
-		vendor=gould
+		basic_machine=pn-gould
 		;;
-	power)
-		cpu=power
-		vendor=ibm
+	power)	basic_machine=power-ibm
 		;;
-	ps2)
-		cpu=i386
-		vendor=ibm
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	rm[46]00)
-		cpu=mips
-		vendor=siemens
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
-	rtpc | rtpc-*)
-		cpu=romp
-		vendor=ibm
+	ppcle | powerpclittle)
+		basic_machine=powerpcle-unknown
 		;;
-	sde)
-		cpu=mipsisa32
-		vendor=sde
-		os=${os:-elf}
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
-	simso-wrs)
-		cpu=sparclite
-		vendor=wrs
-		os=vxworks
+	ppc64)	basic_machine=powerpc64-unknown
 		;;
-	tower | tower-32)
-		cpu=m68k
-		vendor=ncr
+	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
-	vpp*|vx|vx-*)
-		cpu=f301
-		vendor=fujitsu
+	ppc64le | powerpc64little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
-	w65)
-		cpu=w65
-		vendor=wdc
+	ps2)
+		basic_machine=i386-ibm
 		;;
-	w89k-*)
-		cpu=hppa1.1
-		vendor=winbond
-		os=proelf
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
 		;;
-	none)
-		cpu=none
-		vendor=none
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
 		;;
-	leon|leon[3-9])
-		cpu=sparc
-		vendor=$basic_machine
+	rdos32)
+		basic_machine=i386-pc
+		os=-rdos
 		;;
-	leon-*|leon[3-9]-*)
-		cpu=sparc
-		vendor=`echo "$basic_machine" | sed 's/-.*//'`
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
 		;;
-
-	*-*)
-		IFS="-" read -r cpu vendor <<EOF
-$basic_machine
-EOF
+	rm[46]00)
+		basic_machine=mips-siemens
 		;;
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-		cpu=$basic_machine
-		vendor=pc
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
 		;;
-	# These rules are duplicated from below for sake of the special case above;
-	# i.e. things that normalized to x86 arches should also default to "pc"
-	pc98)
-		cpu=i386
-		vendor=pc
+	s390 | s390-*)
+		basic_machine=s390-ibm
 		;;
-	x64 | amd64)
-		cpu=x86_64
-		vendor=pc
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
 		;;
-	# Recognize the basic CPU types without company name.
-	*)
-		cpu=$basic_machine
-		vendor=unknown
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
 		;;
-esac
-
-unset -v basic_machine
-
-# Decode basic machines in the full and proper CPU-Company form.
-case $cpu-$vendor in
-	# Here we handle the default manufacturer of certain CPU types in cannonical form. It is in
-	# some cases the only manufacturer, in others, it is the most popular.
-	craynv-unknown)
-		vendor=cray
-		os=${os:-unicosmp}
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
 		;;
-	c90-unknown | c90-cray)
-		vendor=cray
-		os=${os:-unicos}
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
 		;;
-	fx80-unknown)
-		vendor=alliant
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
 		;;
-	romp-unknown)
-		vendor=ibm
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
 		;;
-	mmix-unknown)
-		vendor=knuth
+	sequent)
+		basic_machine=i386-sequent
 		;;
-	microblaze-unknown | microblazeel-unknown)
-		vendor=xilinx
+	sh5el)
+		basic_machine=sh5le-unknown
 		;;
-	rs6000-unknown)
-		vendor=ibm
+	simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
 		;;
-	vax-unknown)
-		vendor=dec
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
 		;;
-	pdp11-unknown)
-		vendor=dec
+	spur)
+		basic_machine=spur-unknown
 		;;
-	we32k-unknown)
-		vendor=att
+	st2000)
+		basic_machine=m68k-tandem
 		;;
-	cydra-unknown)
-		vendor=cydrome
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
 		;;
-	i370-ibm*)
-		vendor=ibm
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
-	orion-unknown)
-		vendor=highlevel
+	sun2)
+		basic_machine=m68000-sun
 		;;
-	xps-unknown | xps100-unknown)
-		cpu=xps100
-		vendor=honeywell
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
 		;;
-
-	# Here we normalize CPU types with a missing or matching vendor
-	dpx20-unknown | dpx20-bull)
-		cpu=rs6000
-		vendor=bull
-		os=${os:-bosx}
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
 		;;
-
-	# Here we normalize CPU types irrespective of the vendor
-	amd64-*)
-		cpu=x86_64
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
 		;;
-	blackfin-*)
-		cpu=bfin
-		os=linux
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
 		;;
-	c54x-*)
-		cpu=tic54x
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
 		;;
-	c55x-*)
-		cpu=tic55x
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
 		;;
-	c6x-*)
-		cpu=tic6x
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
 		;;
-	e500v[12]-*)
-		cpu=powerpc
-		os=$os"spe"
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
 		;;
-	mips3*-*)
-		cpu=mips64
+	sun4)
+		basic_machine=sparc-sun
 		;;
-	ms1-*)
-		cpu=mt
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
 		;;
-	m68knommu-*)
-		cpu=m68k
-		os=linux
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
 		;;
-	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
-		cpu=s12z
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
 		;;
-	openrisc-*)
-		cpu=or32
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
 		;;
-	parisc-*)
-		cpu=hppa
-		os=linux
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		cpu=i586
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
 		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
-		cpu=i686
+	tx39)
+		basic_machine=mipstx39-unknown
 		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		cpu=i686
+	tx39el)
+		basic_machine=mipstx39el-unknown
 		;;
-	pentium4-*)
-		cpu=i786
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
 		;;
-	pc98-*)
-		cpu=i386
+	tower | tower-32)
+		basic_machine=m68k-ncr
 		;;
-	ppc-* | ppcbe-*)
-		cpu=powerpc
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
 		;;
-	ppcle-* | powerpclittle-*)
-		cpu=powerpcle
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
 		;;
-	ppc64-*)
-		cpu=powerpc64
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
 		;;
-	ppc64le-* | powerpc64little-*)
-		cpu=powerpc64le
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
 		;;
-	sb1-*)
-		cpu=mipsisa64sb1
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
 		;;
-	sb1el-*)
-		cpu=mipsisa64sb1el
+	vms)
+		basic_machine=vax-dec
+		os=-vms
 		;;
-	sh5e[lb]-*)
-		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
 		;;
-	spur-*)
-		cpu=spur
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
 		;;
-	strongarm-* | thumb-*)
-		cpu=arm
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
 		;;
-	tx39-*)
-		cpu=mipstx39
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
 		;;
-	tx39el-*)
-		cpu=mipstx39el
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
 		;;
-	x64-*)
-		cpu=x86_64
+	x64)
+		basic_machine=x86_64-pc
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
 		;;
 	xscale-* | xscalee[bl]-*)
-		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
+		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
 		;;
 
-	# Recognize the cannonical CPU Types that limit and/or modify the
-	# company names they are paired with.
-	cr16-*)
-		os=${os:-elf}
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
 		;;
-	crisv32-* | etraxfs*-*)
-		cpu=crisv32
-		vendor=axis
+	op50n)
+		basic_machine=hppa1.1-oki
 		;;
-	cris-* | etrax*-*)
-		cpu=cris
-		vendor=axis
+	op60c)
+		basic_machine=hppa1.1-oki
 		;;
-	crx-*)
-		os=${os:-elf}
+	romp)
+		basic_machine=romp-ibm
 		;;
-	neo-tandem)
-		cpu=neo
-		vendor=tandem
+	mmix)
+		basic_machine=mmix-knuth
 		;;
-	nse-tandem)
-		cpu=nse
-		vendor=tandem
+	rs6000)
+		basic_machine=rs6000-ibm
 		;;
-	nsr-tandem)
-		cpu=nsr
-		vendor=tandem
+	vax)
+		basic_machine=vax-dec
 		;;
-	nsv-tandem)
-		cpu=nsv
-		vendor=tandem
+	pdp11)
+		basic_machine=pdp11-dec
 		;;
-	nsx-tandem)
-		cpu=nsx
-		vendor=tandem
+	we32k)
+		basic_machine=we32k-att
 		;;
-	s390-*)
-		cpu=s390
-		vendor=ibm
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
 		;;
-	s390x-*)
-		cpu=s390x
-		vendor=ibm
+	cydra)
+		basic_machine=cydra-cydrome
 		;;
-	tile*-*)
-		os=${os:-linux-gnu}
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
 		;;
-
 	*)
-		# Recognize the cannonical CPU types that are allowed with any
-		# company name.
-		case $cpu in
-			1750a | 580 \
-			| a29k \
-			| aarch64 | aarch64_be \
-			| abacus \
-			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
-			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
-			| alphapca5[67] | alpha64pca5[67] \
-			| am33_2.0 \
-			| arc | arceb \
-			| arm  | arm[lb]e | arme[lb] | armv* \
-			| avr | avr32 \
-			| asmjs \
-			| ba \
-			| be32 | be64 \
-			| bfin | bs2000 \
-			| c[123]* | c30 | [cjt]90 | c4x \
-			| c8051 | clipper | craynv | csky | cydra \
-			| d10v | d30v | dlx | dsp16xx \
-			| e2k | elxsi | epiphany \
-			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
-			| h8300 | h8500 \
-			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-			| hexagon \
-			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
-			| ip2k | iq2000 \
-			| k1om \
-			| le32 | le64 \
-			| lm32 \
-			| m32c | m32r | m32rle \
-			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \
-			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
-			| m88110 | m88k | maxq | mb | mcore | mep | metag \
-			| microblaze | microblazeel \
-			| mips | mipsbe | mipseb | mipsel | mipsle \
-			| mips16 \
-			| mips64 | mips64el \
-			| mips64octeon | mips64octeonel \
-			| mips64orion | mips64orionel \
-			| mips64r5900 | mips64r5900el \
-			| mips64vr | mips64vrel \
-			| mips64vr4100 | mips64vr4100el \
-			| mips64vr4300 | mips64vr4300el \
-			| mips64vr5000 | mips64vr5000el \
-			| mips64vr5900 | mips64vr5900el \
-			| mipsisa32 | mipsisa32el \
-			| mipsisa32r2 | mipsisa32r2el \
-			| mipsisa32r6 | mipsisa32r6el \
-			| mipsisa64 | mipsisa64el \
-			| mipsisa64r2 | mipsisa64r2el \
-			| mipsisa64r6 | mipsisa64r6el \
-			| mipsisa64sb1 | mipsisa64sb1el \
-			| mipsisa64sr71k | mipsisa64sr71kel \
-			| mipsr5900 | mipsr5900el \
-			| mipstx39 | mipstx39el \
-			| mmix \
-			| mn10200 | mn10300 \
-			| moxie \
-			| mt \
-			| msp430 \
-			| nds32 | nds32le | nds32be \
-			| nfp \
-			| nios | nios2 | nios2eb | nios2el \
-			| none | np1 | ns16k | ns32k \
-			| open8 \
-			| or1k* \
-			| or32 \
-			| orion \
-			| pdp10 | pdp11 | pj | pjl | pn | power \
-			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
-			| pru \
-			| pyramid \
-			| riscv | riscv32 | riscv64 \
-			| rl78 | romp | rs6000 | rx \
-			| score \
-			| sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
-			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
-			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
-			| sparclite \
-			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
-			| spu \
-			| tahoe \
-			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
-			| tron \
-			| ubicom32 \
-			| v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
-			| vax \
-			| visium \
-			| wasm32 \
-			| we32k \
-			| x86 | x86_64 | xc16x | xgate | xps100 \
-			| xstormy16 | xtensa* \
-			| ymp \
-			| z8k | z80)
-				;;
-
-			*)
-				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
-				exit 1
-				;;
-		esac
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+		exit 1
 		;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
-case $vendor in
-	digital*)
-		vendor=dec
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
 		;;
-	commodore*)
-		vendor=cbm
+	*-commodore*)
+		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
 		;;
 	*)
 		;;
@@ -1270,245 +1334,199 @@ esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if [ x$os != x ]
+if [ x"$os" != x"" ]
 then
 case $os in
 	# First match some system type aliases that might get confused
 	# with valid system types.
-	# solaris* is a basic system type, with this one exception.
-	auroraux)
-		os=auroraux
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
 		;;
-	bluegene*)
-		os=cnk
-		;;
-	solaris1 | solaris1.*)
+	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
-	solaris)
-		os=solaris2
+	-solaris)
+		os=-solaris2
 		;;
-	unixware*)
-		os=sysv4.2uw
+	-unixware*)
+		os=-sysv4.2uw
 		;;
-	gnu/linux*)
+	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
 	# es1800 is here to avoid being matched by es* (a different OS)
-	es1800*)
-		os=ose
-		;;
-	# Some version numbers need modification
-	chorusos*)
-		os=chorusos
-		;;
-	isc)
-		os=isc2.2
-		;;
-	sco6)
-		os=sco5v6
-		;;
-	sco5)
-		os=sco3.2v5
-		;;
-	sco4)
-		os=sco3.2v4
-		;;
-	sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		;;
-	sco3.2v[4-9]* | sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		;;
-	scout)
-		# Don't match below
-		;;
-	sco*)
-		os=sco3.2v2
-		;;
-	psos*)
-		os=psos
+	-es1800*)
+		os=-ose
 		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST end in a * to match a version number.
-	# sysv* is not here because it comes later, after sysvr4.
-	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
-	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
-	     | sym* | kopensolaris* | plan9* \
-	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
-	     | aos* | aros* | cloudabi* | sortix* \
-	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
-	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
-	     | knetbsd* | mirbsd* | netbsd* \
-	     | bitrig* | openbsd* | solidbsd* | libertybsd* \
-	     | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
-	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
-	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
-	     | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
-	     | chorusrdb* | cegcc* | glidix* \
-	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
-	     | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
-	     | linux-newlib* | linux-musl* | linux-uclibc* \
-	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
-	     | interix* | uwin* | mks* | rhapsody* | darwin* \
-	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
-	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
-	     | os2* | vos* | palmos* | uclinux* | nucleus* \
-	     | morphos* | superux* | rtmk* | windiss* \
-	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
-	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
-	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-	     | midnightbsd*)
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* | -cloudabi* | -sortix* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
+	      | -midnightbsd*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
-	qnx*)
-		case $cpu in
-		    x86 | i*86)
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
 			;;
 		    *)
-			os=nto-$os
+			os=-nto$os
 			;;
 		esac
 		;;
-	hiux*)
-		os=hiuxwe2
-		;;
-	nto-qnx*)
+	-nto-qnx*)
 		;;
-	nto*)
+	-nto*)
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
-	sim | xray | os68k* | v88r* \
-	    | windows* | osx | abug | netware* | os9* \
-	    | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
-		;;
-	linux-dietlibc)
-		os=linux-dietlibc
-		;;
-	linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	lynx*178)
-		os=lynxos178
+	-sim | -xray | -os68k* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
-	lynx*5)
-		os=lynxos5
-		;;
-	lynx*)
-		os=lynxos
-		;;
-	mac*)
+	-mac*)
 		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
-	opened*)
-		os=openedition
+	-linux-dietlibc)
+		os=-linux-dietlibc
 		;;
-	os400*)
-		os=os400
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
-	sunos5*)
+	-sunos5*)
 		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 		;;
-	sunos6*)
+	-sunos6*)
 		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 		;;
-	wince*)
-		os=wince
+	-opened*)
+		os=-openedition
 		;;
-	utek*)
-		os=bsd
+	-os400*)
+		os=-os400
 		;;
-	dynix*)
-		os=bsd
+	-wince*)
+		os=-wince
 		;;
-	acis*)
-		os=aos
+	-utek*)
+		os=-bsd
 		;;
-	atheos*)
-		os=atheos
+	-dynix*)
+		os=-bsd
 		;;
-	syllable*)
-		os=syllable
+	-acis*)
+		os=-aos
 		;;
-	386bsd)
-		os=bsd
+	-atheos*)
+		os=-atheos
 		;;
-	ctix* | uts*)
-		os=sysv
+	-syllable*)
+		os=-syllable
 		;;
-	nova*)
-		os=rtmk-nova
+	-386bsd)
+		os=-bsd
 		;;
-	ns2)
-		os=nextstep2
+	-ctix* | -uts*)
+		os=-sysv
 		;;
-	nsk*)
-		os=nsk
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2)
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
 		;;
 	# Preserve the version number of sinix5.
-	sinix5.*)
+	-sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
 		;;
-	sinix*)
-		os=sysv4
+	-sinix*)
+		os=-sysv4
 		;;
-	tpf*)
-		os=tpf
+	-tpf*)
+		os=-tpf
 		;;
-	triton*)
-		os=sysv3
+	-triton*)
+		os=-sysv3
 		;;
-	oss*)
-		os=sysv3
+	-oss*)
+		os=-sysv3
 		;;
-	svr4*)
-		os=sysv4
+	-svr4*)
+		os=-sysv4
 		;;
-	svr3)
-		os=sysv3
+	-svr3)
+		os=-sysv3
 		;;
-	sysvr4)
-		os=sysv4
+	-sysvr4)
+		os=-sysv4
 		;;
-	# This must come after sysvr4.
-	sysv*)
+	# This must come after -sysvr4.
+	-sysv*)
 		;;
-	ose*)
-		os=ose
+	-ose*)
+		os=-ose
 		;;
-	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
-		os=mint
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
 		;;
-	zvmoe)
-		os=zvmoe
+	-zvmoe)
+		os=-zvmoe
 		;;
-	dicos*)
-		os=dicos
+	-dicos*)
+		os=-dicos
 		;;
-	pikeos*)
+	-pikeos*)
 		# Until real need of OS specific support for
 		# particular features comes up, bare metal
 		# configurations are quite functional.
-		case $cpu in
+		case $basic_machine in
 		    arm*)
-			os=eabi
+			os=-eabi
 			;;
 		    *)
-			os=elf
+			os=-elf
 			;;
 		esac
 		;;
-	nacl*)
+	-nacl*)
 		;;
-	ios)
+	-ios)
 		;;
-	none)
-		;;
-	*-eabi)
+	-none)
 		;;
 	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
 		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
 		exit 1
 		;;
@@ -1525,265 +1543,258 @@ else
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
-case $cpu-$vendor in
+case $basic_machine in
 	score-*)
-		os=elf
+		os=-elf
 		;;
 	spu-*)
-		os=elf
+		os=-elf
 		;;
 	*-acorn)
-		os=riscix1.2
+		os=-riscix1.2
 		;;
 	arm*-rebel)
-		os=linux
+		os=-linux
 		;;
 	arm*-semi)
-		os=aout
+		os=-aout
 		;;
 	c4x-* | tic4x-*)
-		os=coff
+		os=-coff
 		;;
 	c8051-*)
-		os=elf
-		;;
-	clipper-intergraph)
-		os=clix
+		os=-elf
 		;;
 	hexagon-*)
-		os=elf
+		os=-elf
 		;;
 	tic54x-*)
-		os=coff
+		os=-coff
 		;;
 	tic55x-*)
-		os=coff
+		os=-coff
 		;;
 	tic6x-*)
-		os=coff
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
-		os=tops20
+		os=-tops20
 		;;
 	pdp11-*)
-		os=none
+		os=-none
 		;;
 	*-dec | vax-*)
-		os=ultrix4.2
+		os=-ultrix4.2
 		;;
 	m68*-apollo)
-		os=domain
+		os=-domain
 		;;
 	i386-sun)
-		os=sunos4.0.2
+		os=-sunos4.0.2
 		;;
 	m68000-sun)
-		os=sunos3
+		os=-sunos3
 		;;
 	m68*-cisco)
-		os=aout
+		os=-aout
 		;;
 	mep-*)
-		os=elf
+		os=-elf
 		;;
 	mips*-cisco)
-		os=elf
+		os=-elf
 		;;
 	mips*-*)
-		os=elf
+		os=-elf
 		;;
 	or32-*)
-		os=coff
+		os=-coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=sysv3
+		os=-sysv3
 		;;
 	sparc-* | *-sun)
-		os=sunos4.1.1
+		os=-sunos4.1.1
 		;;
 	pru-*)
-		os=elf
+		os=-elf
 		;;
 	*-be)
-		os=beos
+		os=-beos
 		;;
 	*-ibm)
-		os=aix
+		os=-aix
 		;;
 	*-knuth)
-		os=mmixware
+		os=-mmixware
 		;;
 	*-wec)
-		os=proelf
+		os=-proelf
 		;;
 	*-winbond)
-		os=proelf
+		os=-proelf
 		;;
 	*-oki)
-		os=proelf
+		os=-proelf
 		;;
 	*-hp)
-		os=hpux
+		os=-hpux
 		;;
 	*-hitachi)
-		os=hiux
+		os=-hiux
 		;;
 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=sysv
+		os=-sysv
 		;;
 	*-cbm)
-		os=amigaos
+		os=-amigaos
 		;;
 	*-dg)
-		os=dgux
+		os=-dgux
 		;;
 	*-dolphin)
-		os=sysv3
+		os=-sysv3
 		;;
 	m68k-ccur)
-		os=rtu
+		os=-rtu
 		;;
 	m88k-omron*)
-		os=luna
+		os=-luna
 		;;
 	*-next)
-		os=nextstep
+		os=-nextstep
 		;;
 	*-sequent)
-		os=ptx
+		os=-ptx
 		;;
 	*-crds)
-		os=unos
+		os=-unos
 		;;
 	*-ns)
-		os=genix
+		os=-genix
 		;;
 	i370-*)
-		os=mvs
+		os=-mvs
 		;;
 	*-gould)
-		os=sysv
+		os=-sysv
 		;;
 	*-highlevel)
-		os=bsd
+		os=-bsd
 		;;
 	*-encore)
-		os=bsd
+		os=-bsd
 		;;
 	*-sgi)
-		os=irix
+		os=-irix
 		;;
 	*-siemens)
-		os=sysv4
+		os=-sysv4
 		;;
 	*-masscomp)
-		os=rtu
+		os=-rtu
 		;;
 	f30[01]-fujitsu | f700-fujitsu)
-		os=uxpv
+		os=-uxpv
 		;;
 	*-rom68k)
-		os=coff
+		os=-coff
 		;;
 	*-*bug)
-		os=coff
+		os=-coff
 		;;
 	*-apple)
-		os=macos
+		os=-macos
 		;;
 	*-atari*)
-		os=mint
-		;;
-	*-wrs)
-		os=vxworks
+		os=-mint
 		;;
 	*)
-		os=none
+		os=-none
 		;;
 esac
 fi
 
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer.  We pick the logical manufacturer.
-case $vendor in
-	unknown)
+vendor=unknown
+case $basic_machine in
+	*-unknown)
 		case $os in
-			riscix*)
+			-riscix*)
 				vendor=acorn
 				;;
-			sunos*)
+			-sunos*)
 				vendor=sun
 				;;
-			cnk*|-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
-			beos*)
+			-beos*)
 				vendor=be
 				;;
-			hpux*)
+			-hpux*)
 				vendor=hp
 				;;
-			mpeix*)
+			-mpeix*)
 				vendor=hp
 				;;
-			hiux*)
+			-hiux*)
 				vendor=hitachi
 				;;
-			unos*)
+			-unos*)
 				vendor=crds
 				;;
-			dgux*)
+			-dgux*)
 				vendor=dg
 				;;
-			luna*)
+			-luna*)
 				vendor=omron
 				;;
-			genix*)
+			-genix*)
 				vendor=ns
 				;;
-			clix*)
-				vendor=intergraph
-				;;
-			mvs* | opened*)
+			-mvs* | -opened*)
 				vendor=ibm
 				;;
-			os400*)
+			-os400*)
 				vendor=ibm
 				;;
-			ptx*)
+			-ptx*)
 				vendor=sequent
 				;;
-			tpf*)
+			-tpf*)
 				vendor=ibm
 				;;
-			vxsim* | vxworks* | windiss*)
+			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
-			aux*)
+			-aux*)
 				vendor=apple
 				;;
-			hms*)
+			-hms*)
 				vendor=hitachi
 				;;
-			mpw* | macos*)
+			-mpw* | -macos*)
 				vendor=apple
 				;;
-			*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
-			vos*)
+			-vos*)
 				vendor=stratus
 				;;
 		esac
+		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
 		;;
 esac
 
-echo "$cpu-$vendor-$os"
+echo "$basic_machine$os"
 exit
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
diff --git a/configure b/configure
index 01558b9..ed25311 100755
--- a/configure
+++ b/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.7.
+# Generated by GNU Autoconf 2.69 for tor 0.4.6.8.
 #
 #
 # 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.7'
-PACKAGE_STRING='tor 0.4.6.7'
+PACKAGE_VERSION='0.4.6.8'
+PACKAGE_STRING='tor 0.4.6.8'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -795,6 +795,9 @@ AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
 AM_V
+CSCOPE
+ETAGS
+CTAGS
 am__untar
 am__tar
 AMTAR
@@ -1498,7 +1501,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.7 to adapt to many kinds of systems.
+\`configure' configures tor 0.4.6.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1569,7 +1572,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tor 0.4.6.7:";;
+     short | recursive ) echo "Configuration of tor 0.4.6.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1796,7 +1799,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tor configure 0.4.6.7
+tor configure 0.4.6.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2501,7 +2504,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.7, which was
+It was created by tor $as_me 0.4.6.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2867,7 +2870,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-08-16\"" >>confdefs.h
+$as_echo "#define APPROX_RELEASE_DATE \"2021-10-26\"" >>confdefs.h
 
 
 # "foreign" means we don't follow GNU package layout standards
@@ -3078,12 +3081,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
@@ -3388,7 +3386,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tor'
- VERSION='0.4.6.7'
+ VERSION='0.4.6.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3438,6 +3436,20 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+
+
 
 # POSIX will say in a future version that running "rm -f" with no argument
 # is OK; and we want to be able to make that assumption in our Makefile
@@ -13975,7 +13987,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -14021,7 +14033,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -14045,7 +14057,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -14090,7 +14102,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -14114,7 +14126,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -29878,7 +29890,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.7, which was
+This file was extended by tor $as_me 0.4.6.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29944,7 +29956,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.7
+tor config.status 0.4.6.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 788597b..43f9f47 100644
--- a/configure.ac
+++ b/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.7])
+AC_INIT([tor],[0.4.6.8])
 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-08-16"], # for 0.4.6.7
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.6.8
           [Approximate date when this software was released. (Updated when the version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in
index 3dd4701..c59769c 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.6.7"
+!define VERSION "0.4.6.8"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"
diff --git a/doc/man/tor-gencert.1.in b/doc/man/tor-gencert.1.in
index 5392152..1d40ec3 100644
--- a/doc/man/tor-gencert.1.in
+++ b/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: 05/07/2021
+.\"      Date: 10/26/2021
 .\"    Manual: Tor Manual
 .\"    Source: Tor
 .\"  Language: English
 .\"
-.TH "TOR\-GENCERT" "1" "05/07/2021" "Tor" "Tor Manual"
+.TH "TOR\-GENCERT" "1" "10/26/2021" "Tor" "Tor Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/man/tor-gencert.html.in b/doc/man/tor-gencert.html.in
index d73b022..88c587b 100644
--- a/doc/man/tor-gencert.html.in
+++ b/doc/man/tor-gencert.html.in
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 9.1.0" />
+<meta name="generator" content="AsciiDoc 9.0.0rc2" />
 <title>tor-gencert(1)</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -885,7 +885,7 @@ really want authorities to be running on Windows anyway.</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2021-04-15 16:41:14 UTC
+ 2021-10-20 13:17:03 UTC
 </div>
 </div>
 </body>
diff --git a/doc/man/tor-print-ed-signing-cert.1.in b/doc/man/tor-print-ed-signing-cert.1.in
index 8145921..77e8726 100644
--- a/doc/man/tor-print-ed-signing-cert.1.in
+++ b/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: 05/07/2021
+.\"      Date: 10/26/2021
 .\"    Manual: Tor Manual
 .\"    Source: Tor
 .\"  Language: English
 .\"
-.TH "TOR\-PRINT\-ED\-SIGN" "1" "05/07/2021" "Tor" "Tor Manual"
+.TH "TOR\-PRINT\-ED\-SIGN" "1" "10/26/2021" "Tor" "Tor Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/man/tor-print-ed-signing-cert.html.in b/doc/man/tor-print-ed-signing-cert.html.in
index dc79c93..3879279 100644
--- a/doc/man/tor-print-ed-signing-cert.html.in
+++ b/doc/man/tor-print-ed-signing-cert.html.in
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 9.1.0" />
+<meta name="generator" content="AsciiDoc 9.0.0rc2" />
 <title>tor-print-ed-signing-cert(1)</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -788,7 +788,7 @@ Unix time value.
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2021-04-15 16:41:14 UTC
+ 2021-10-20 13:17:03 UTC
 </div>
 </div>
 </body>
diff --git a/doc/man/tor-resolve.1.in b/doc/man/tor-resolve.1.in
index 4936bc7..a675180 100644
--- a/doc/man/tor-resolve.1.in
+++ b/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: 05/07/2021
+.\"      Date: 10/26/2021
 .\"    Manual: Tor Manual
 .\"    Source: Tor
 .\"  Language: English
 .\"
-.TH "TOR\-RESOLVE" "1" "05/07/2021" "Tor" "Tor Manual"
+.TH "TOR\-RESOLVE" "1" "10/26/2021" "Tor" "Tor Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/man/tor-resolve.html.in b/doc/man/tor-resolve.html.in
index 6e4a451..7948c53 100644
--- a/doc/man/tor-resolve.html.in
+++ b/doc/man/tor-resolve.html.in
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 9.1.0" />
+<meta name="generator" content="AsciiDoc 9.0.0rc2" />
 <title>tor-resolve(1)</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -821,7 +821,7 @@ port 9050.  If this isn&#8217;t what you want, you should specify an explicit
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2021-04-15 16:41:14 UTC
+ 2021-10-20 13:17:03 UTC
 </div>
 </div>
 </body>
diff --git a/doc/man/tor.1.in b/doc/man/tor.1.in
index fea1be5..2d2885f 100644
--- a/doc/man/tor.1.in
+++ b/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: 05/07/2021
+.\"      Date: 10/26/2021
 .\"    Manual: Tor Manual
 .\"    Source: Tor
 .\"  Language: English
 .\"
-.TH "TOR" "1" "05/07/2021" "Tor" "Tor Manual"
+.TH "TOR" "1" "10/26/2021" "Tor" "Tor Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -3521,6 +3521,11 @@ Sets a lower\-bound for assigning an exit flag when running as an authority on a
 Minimum value for the Fast flag\&. Overrides the ordinary minimum taken from the consensus when TestingTorNetwork is set\&. (Default: 0\&.)
 .RE
 .PP
+\fBTestingMinTimeToReportBandwidth\fR \fIN\fR \fBseconds\fR|\fBminutes\fR|\fBhours\fR
+.RS 4
+Do not report our measurements for our maximum observed bandwidth for any time period that has lasted for less than this amount of time\&. Values over 1 day have no effect\&. (Default: 1 day)
+.RE
+.PP
 \fBTestingServerConsensusDownloadInitialDelay\fR \fIN\fR
 .RS 4
 Initial delay in seconds for when servers should download consensuses\&. Changing this requires that
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index 7222cd0..89afe59 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -3597,6 +3597,11 @@ The following options are used for running a testing Tor network.
     Minimum value for the Fast flag.  Overrides the ordinary minimum taken
     from the consensus when TestingTorNetwork is set. (Default: 0.)
 
+[[TestingMinTimeToReportBandwidth]] **TestingMinTimeToReportBandwidth** __N__ **seconds**|**minutes**|**hours**::
+    Do not report our measurements for our maximum observed bandwidth for any
+    time period that has lasted for less than this amount of time.
+    Values over 1 day have no effect. (Default: 1 day)
+
 [[TestingServerConsensusDownloadInitialDelay]] **TestingServerConsensusDownloadInitialDelay** __N__::
     Initial delay in seconds for when servers should download consensuses. Changing this
     requires that **TestingTorNetwork** is set. (Default: 0)
diff --git a/doc/man/tor.html.in b/doc/man/tor.html.in
index 9fd2af2..0983de5 100644
--- a/doc/man/tor.html.in
+++ b/doc/man/tor.html.in
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 9.1.0" />
+<meta name="generator" content="AsciiDoc 9.0.0rc2" />
 <title>TOR(1)</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -737,9 +737,9 @@ asciidoc.install(2);
 <h1>
 TOR(1) Manual Page
 </h1>
-<div id="toc">
-  <div id="toctitle">Table of Contents</div>
-  <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
+<div id="toc">
+  <div id="toctitle">Table of Contents</div>
+  <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
 </div>
 <h2>NAME</h2>
 <div class="sectionbody">
@@ -6326,6 +6326,16 @@ RendPostPeriod 2 minutes</code></pre>
 </p>
 </dd>
 <dt class="hdlist1">
+<a id="TestingMinTimeToReportBandwidth"></a> <strong>TestingMinTimeToReportBandwidth</strong> <em>N</em> <strong>seconds</strong>|<strong>minutes</strong>|<strong>hours</strong>
+</dt>
+<dd>
+<p>
+    Do not report our measurements for our maximum observed bandwidth for any
+    time period that has lasted for less than this amount of time.
+    Values over 1 day have no effect. (Default: 1 day)
+</p>
+</dd>
+<dt class="hdlist1">
 <a id="TestingServerConsensusDownloadInitialDelay"></a> <strong>TestingServerConsensusDownloadInitialDelay</strong> <em>N</em>
 </dt>
 <dd>
@@ -7015,7 +7025,7 @@ report them at <a href="https://bugs.torproject.org/">https://bugs.torproject.or
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2021-04-15 16:41:14 UTC
+ 2021-10-21 12:58:25 UTC
 </div>
 </div>
 </body>
diff --git a/doc/man/torify.1.in b/doc/man/torify.1.in
index 13fda91..44de944 100644
--- a/doc/man/torify.1.in
+++ b/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: 05/07/2021
+.\"      Date: 10/26/2021
 .\"    Manual: Tor Manual
 .\"    Source: Tor
 .\"  Language: English
 .\"
-.TH "TORIFY" "1" "05/07/2021" "Tor" "Tor Manual"
+.TH "TORIFY" "1" "10/26/2021" "Tor" "Tor Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/man/torify.html.in b/doc/man/torify.html.in
index 54cad2f..4d2e900 100644
--- a/doc/man/torify.html.in
+++ b/doc/man/torify.html.in
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 9.1.0" />
+<meta name="generator" content="AsciiDoc 9.0.0rc2" />
 <title>torify(1)</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -779,7 +779,7 @@ different circuits.</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2021-04-15 16:41:14 UTC
+ 2021-10-20 13:17:03 UTC
 </div>
 </div>
 </body>
diff --git a/install-sh b/install-sh
index 20d8b2e..ec298b5 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2018-03-11.20; # UTC
+scriptversion=2020-11-14.01; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -69,6 +69,11 @@ posix_mkdir=
 # Desired mode of installed file.
 mode=0755
 
+# Create dirs (including intermediate dirs) using mode 755.
+# This is like GNU 'install' as of coreutils 8.32 (2020).
+mkdir_umask=22
+
+backupsuffix=
 chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
@@ -99,18 +104,28 @@ Options:
      --version  display version info and exit.
 
   -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
+  -C            install only if different (preserve data modification time)
   -d            create directories instead of installing files.
   -g GROUP      $chgrpprog installed files to GROUP.
   -m MODE       $chmodprog installed files to MODE.
   -o USER       $chownprog installed files to USER.
+  -p            pass -p to $cpprog.
   -s            $stripprog installed files.
+  -S SUFFIX     attempt to back up existing files, with suffix SUFFIX.
   -t DIRECTORY  install into DIRECTORY.
   -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
   CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
   RMPROG STRIPPROG
+
+By default, rm is invoked with -f; when overridden with RMPROG,
+it's up to you to specify -f if you want it.
+
+If -S is not specified, no backups are attempted.
+
+Email bug reports to bug-automake@gnu.org.
+Automake home page: https://www.gnu.org/software/automake/
 "
 
 while test $# -ne 0; do
@@ -137,8 +152,13 @@ while test $# -ne 0; do
     -o) chowncmd="$chownprog $2"
         shift;;
 
+    -p) cpprog="$cpprog -p";;
+
     -s) stripcmd=$stripprog;;
 
+    -S) backupsuffix="$2"
+        shift;;
+
     -t)
         is_target_a_directory=always
         dst_arg=$2
@@ -255,6 +275,10 @@ do
     dstdir=$dst
     test -d "$dstdir"
     dstdir_status=$?
+    # Don't chown directories that already exist.
+    if test $dstdir_status = 0; then
+      chowncmd=""
+    fi
   else
 
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
@@ -301,22 +325,6 @@ do
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-        # Create intermediate dirs using mode 755 as modified by the umask.
-        # This is like FreeBSD 'install' as of 1997-10-28.
-        umask=`umask`
-        case $stripcmd.$umask in
-          # Optimize common cases.
-          *[2367][2367]) mkdir_umask=$umask;;
-          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-          *[0-7])
-            mkdir_umask=`expr $umask + 22 \
-              - $umask % 100 % 40 + $umask % 20 \
-              - $umask % 10 % 4 + $umask % 2
-            `;;
-          *) mkdir_umask=$umask,go-w;;
-        esac
-
         # With -d, create the new directory with the user-specified mode.
         # Otherwise, rely on $mkdir_umask.
         if test -n "$dir_arg"; then
@@ -326,52 +334,49 @@ do
         fi
 
         posix_mkdir=false
-        case $umask in
-          *[123567][0-7][0-7])
-            # POSIX mkdir -p sets u+wx bits regardless of umask, which
-            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-            ;;
-          *)
-            # Note that $RANDOM variable is not portable (e.g. dash);  Use it
-            # here however when possible just to lower collision chance.
-            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-
-            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-            # Because "mkdir -p" follows existing symlinks and we likely work
-            # directly in world-writeable /tmp, make sure that the '$tmpdir'
-            # directory is successfully created first before we actually test
-            # 'mkdir -p' feature.
-            if (umask $mkdir_umask &&
-                $mkdirprog $mkdir_mode "$tmpdir" &&
-                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
-            then
-              if test -z "$dir_arg" || {
-                   # Check for POSIX incompatibilities with -m.
-                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-                   # other-writable bit of parent directory when it shouldn't.
-                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-                   test_tmpdir="$tmpdir/a"
-                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
-                   case $ls_ld_tmpdir in
-                     d????-?r-*) different_mode=700;;
-                     d????-?--*) different_mode=755;;
-                     *) false;;
-                   esac &&
-                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
-                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
-                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-                   }
-                 }
-              then posix_mkdir=:
-              fi
-              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
-            else
-              # Remove any dirs left behind by ancient mkdir implementations.
-              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
-            fi
-            trap '' 0;;
-        esac;;
+	# The $RANDOM variable is not portable (e.g., dash).  Use it
+	# here however when possible just to lower collision chance.
+	tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
+	trap '
+	  ret=$?
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
+	  exit $ret
+	' 0
+
+	# Because "mkdir -p" follows existing symlinks and we likely work
+	# directly in world-writeable /tmp, make sure that the '$tmpdir'
+	# directory is successfully created first before we actually test
+	# 'mkdir -p'.
+	if (umask $mkdir_umask &&
+	    $mkdirprog $mkdir_mode "$tmpdir" &&
+	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+	then
+	  if test -z "$dir_arg" || {
+	       # Check for POSIX incompatibilities with -m.
+	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+	       # other-writable bit of parent directory when it shouldn't.
+	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+	       test_tmpdir="$tmpdir/a"
+	       ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+	       case $ls_ld_tmpdir in
+		 d????-?r-*) different_mode=700;;
+		 d????-?--*) different_mode=755;;
+		 *) false;;
+	       esac &&
+	       $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+		 ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+		 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+	       }
+	     }
+	  then posix_mkdir=:
+	  fi
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+	else
+	  # Remove any dirs left behind by ancient mkdir implementations.
+	  rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+	fi
+	trap '' 0;;
     esac
 
     if
@@ -382,7 +387,7 @@ do
     then :
     else
 
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # mkdir does not conform to POSIX,
       # or it failed possibly due to a race condition.  Create the
       # directory the slow way, step by step, checking for races as we go.
 
@@ -411,7 +416,7 @@ do
           prefixes=
         else
           if $posix_mkdir; then
-            (umask=$mkdir_umask &&
+            (umask $mkdir_umask &&
              $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
             # Don't fail if two instances are running concurrently.
             test -d "$prefix" || exit 1
@@ -488,6 +493,13 @@ do
     then
       rm -f "$dsttmp"
     else
+      # If $backupsuffix is set, and the file being installed
+      # already exists, attempt a backup.  Don't worry if it fails,
+      # e.g., if mv doesn't support -f.
+      if test -n "$backupsuffix" && test -f "$dst"; then
+        $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
+      fi
+
       # Rename the file to the real destination.
       $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
 
@@ -502,9 +514,9 @@ do
         # file should still install successfully.
         {
           test ! -f "$dst" ||
-          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          $doit $rmcmd "$dst" 2>/dev/null ||
           { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+            { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
           } ||
           { echo "$0: cannot unlink or rename $dst" >&2
             (exit 1); exit 1
diff --git a/orconfig.h.in b/orconfig.h.in
index 9433754..63b9cde 100644
--- a/orconfig.h.in
+++ b/orconfig.h.in
@@ -6,7 +6,7 @@
 /* All assert failures are fatal */
 #undef ALL_BUGS_ARE_FATAL
 
-/* # for 0.4.6.7 Approximate date when this software was released. (Updated
+/* # for 0.4.6.8 Approximate date when this software was released. (Updated
    when the version changes.) */
 #undef APPROX_RELEASE_DATE
 
diff --git a/src/app/config/config.c b/src/app/config/config.c
index bfa258c..2877bc1 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -550,6 +550,7 @@ static const config_var_t option_vars_[] = {
   V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"),
   VPORT(MetricsPort),
   V(MetricsPortPolicy,           LINELIST, NULL),
+  V(TestingMinTimeToReportBandwidth,    INTERVAL, "1 day"),
   VAR("MyFamily",                LINELIST, MyFamily_lines,       NULL),
   V(NewCircuitPeriod,            INTERVAL, "30 seconds"),
   OBSOLETE("NamingAuthoritativeDirectory"),
@@ -3980,6 +3981,7 @@ options_validate_cb(const void *old_options_, void *options_, char **msg)
     CHECK_DEFAULT(TestingSigningKeySlop);
     CHECK_DEFAULT(TestingAuthKeySlop);
     CHECK_DEFAULT(TestingLinkKeySlop);
+    CHECK_DEFAULT(TestingMinTimeToReportBandwidth);
     or_options_free(dflt_options);
   }
 #undef CHECK_DEFAULT
diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc
index 75d01e2..ea1928e 100644
--- a/src/app/config/fallback_dirs.inc
+++ b/src/app/config/fallback_dirs.inc
@@ -3,1086 +3,1075 @@
 /* timestamp=20210412000000 */
 /* source=offer-list */
 //
-// Generated on: Wed, 11 Aug 2021 12:54:23 +0000
+// Generated on: Thu, 21 Oct 2021 13:07:39 +0000
 
-"46.126.96.8 orport=9001 id=2C74829C382C1363812FC2BF053122A9DCF6583B"
-/* nickname=ElNinoRelay */
+"62.210.105.46 orport=9001 id=ADB98B27D7A3FB5732068FD23602A1BCB3BE9F38"
+/* nickname=Assange008fr */
 /* extrainfo=0 */
 /* ===== */
 ,
-"85.214.141.24 orport=9001 id=BCC93B0ACA325374086A5100D02843A04EBDCC00"
-" ipv6=[2a01:238:420e:ae00:1c37:63c1:24c0:ff75]:9001"
-/* nickname=tor1VaxariNet */
+"95.128.43.164 orport=443 id=616081EC829593AF4232550DE6FFAA1D75B37A90"
+" ipv6=[2a02:ec0:209:10::4]:443"
+/* nickname=AquaRayTerminus */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.76.191.83 orport=443 id=1730E41B3B004479D4EF124B5364CC34CE86F4EA"
-/* nickname=x23tor83 */
+"5.79.79.133 orport=443 id=D079D6818926684C5979C18171FB18862A4A5792"
+/* nickname=beerbox */
 /* extrainfo=0 */
 /* ===== */
 ,
-"89.41.173.138 orport=443 id=B6942C63F1A596E6557D13FC0ACF8475A0A2AD3F"
-/* nickname=owin */
+"91.121.103.117 orport=9001 id=CA53F344DB85248D69A97E900A0EC3C31AC04D25"
+/* nickname=NoSuchRelay */
 /* extrainfo=0 */
 /* ===== */
 ,
-"142.4.213.88 orport=443 id=552FBD8FC8E7C5AC05FC6F8C960BDAF1081413B2"
-/* nickname=Unnamed */
+"109.70.100.9 orport=443 id=C8AE26D4819504D0157AD4C5DE7D5A0A7E190D10"
+" ipv6=[2a03:e600:100::9]:443"
+/* nickname=rucola */
 /* extrainfo=0 */
 /* ===== */
 ,
-"148.251.191.252 orport=443 id=56781CCC9F6D29FEA148799AB588429C893A473C"
-" ipv6=[2a01:4f8:211:d4f::2]:443"
-/* nickname=scurra */
+"83.205.231.204 orport=9001 id=E05CAC929E391787077066C29461A9D22ECF0809"
+/* nickname=albator */
 /* extrainfo=0 */
 /* ===== */
 ,
-"51.89.143.155 orport=443 id=A932F56F69D24A96A0CBC4F32922A62DEFD28C77"
-/* nickname=UenoStation55 */
+"37.252.187.111 orport=443 id=EE4AF632058F0734C1426B1AD689F47445CA2056"
+" ipv6=[2a00:63c1:c:111::2]:443"
+/* nickname=rinderwahnRelay7L */
 /* extrainfo=0 */
 /* ===== */
 ,
-"86.80.108.228 orport=9001 id=69497036653189531207746B3D0E4ECB56888F3C"
-/* nickname=octavsly */
+"144.76.157.242 orport=9001 id=00C22D3BC1822EB8EA380AF04245337399E796E2"
+" ipv6=[2a01:4f8:200:30f5::103]:9001"
+/* nickname=iriseden */
 /* extrainfo=0 */
 /* ===== */
 ,
-"54.37.232.61 orport=443 id=973B219FDAC30873212D866568B30C44D57B32E5"
-/* nickname=NikowskiThirdNode */
+"212.47.233.86 orport=9001 id=B4CAFD9CBFB34EC5DAAC146920DC7DFAFE91EA20"
+" ipv6=[2001:bc8:630:194::1]:9001"
+/* nickname=netimanmu */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.76.191.76 orport=443 id=837528CA94748B72CE1829E4E23A7EAB232C30E6"
-/* nickname=x23tor76 */
+"173.212.231.228 orport=9001 id=55403B9653A81F68C39787E000BD9F97E1F3B250"
+/* nickname=StriveForFreedom */
 /* extrainfo=0 */
 /* ===== */
 ,
-"45.140.170.187 orport=9001 id=A9B28E4D4FB6A26B5B6D3EDED2655D836BBD4E57"
-/* nickname=Assange011ruX */
+"62.216.54.29 orport=9001 id=16824F885D72B4FA7A5090E08D877E5404BC214D"
+/* nickname=guidemenow */
 /* extrainfo=0 */
 /* ===== */
 ,
-"81.83.37.138 orport=9001 id=B22A56D8AE494A20CA0EB8457F3CAC54FC99ACCE"
-" ipv6=[2a02:1810:38a2:d400:ba27:ebff:fec2:3e7e]:9001"
-/* nickname=Unnamed */
+"213.239.213.190 orport=443 id=4E98AA295B7171996D18DD1F6A19F64AB4036B4A"
+/* nickname=summalummadooma */
 /* extrainfo=0 */
 /* ===== */
 ,
-"82.64.163.188 orport=9001 id=4F95B7313679ECC000F38F870CF0CF39C7386C50"
-/* nickname=Ajorcel */
+"5.9.37.162 orport=9001 id=6C1A8CBE589906EEC6E73F4F286AC29AF7521E1D"
+" ipv6=[2a01:4f8:161:21a9::2]:9001"
+/* nickname=vahShei7Eeth */
 /* extrainfo=0 */
 /* ===== */
 ,
-"104.244.73.93 orport=9000 id=6183B493ACFF41B28745CF0322E75AD7BDE4A48B"
-" ipv6=[2605:6400:30:f73d:de71:a4eb:1b99:9545]:9000"
-/* nickname=Quetzalcoatl */
+"82.69.47.114 orport=443 id=43E896D36AAB20B5B63094BBC52CAD4B560E47BF"
+/* nickname=DeLoreanDynamite */
 /* extrainfo=0 */
 /* ===== */
 ,
-"194.38.21.10 orport=9001 id=690FC3ACBBBC970309A9A0993EE12AF44C0C8E62"
-/* nickname=Rowlet */
+"51.15.177.140 orport=993 id=ECD239A3B2CAD7375D218B624BCA270CDBFE2A29"
+" ipv6=[2001:bc8:3fec:500:7ea::]:993"
+/* nickname=Casper10 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"58.185.69.242 orport=8443 id=DF6F2B91C93270771C8EC92D243A7CB6234244A1"
-/* nickname=orangepeel */
+"209.141.57.122 orport=443 id=051FB296CDF787B5B97A9F2C5CD6FA3E10C27045"
+/* nickname=Unnamed */
 /* extrainfo=0 */
 /* ===== */
 ,
-"49.194.93.54 orport=9001 id=0D8877392F2FF5AD8D8E5BC438087F02EF97B904"
-/* nickname=Starlight */
+"193.234.15.58 orport=443 id=F24F8BEA2779A79111F33F6832B062BED306B9CB"
+" ipv6=[2a00:1c20:4089:1234:cdae:1b3e:cc38:3d45]:443"
+/* nickname=jaures2 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"82.35.159.1 orport=9001 id=289F955FA04BD224F18DED9D4766529705FBDC48"
-/* nickname=PixelBullyRelay */
+"185.228.138.252 orport=8080 id=91BAB54C6923454F4E5EDC59313C45002B238665"
+" ipv6=[2a03:4000:23:409:748d:52ff:fe41:cdcc]:8080"
+/* nickname=CryptoHouse */
 /* extrainfo=0 */
 /* ===== */
 ,
-"37.157.254.37 orport=443 id=9423A72BBC8B5C6AC9DE9F57735EB2B08E4156E8"
-" ipv6=[2001:4ba0:ffff:11a::3]:443"
-/* nickname=TorOrDie4privacyNET */
+"77.23.45.123 orport=9001 id=5887DD4FC027A14DE4985429C38BF78C297B7795"
+/* nickname=Shredder */
 /* extrainfo=0 */
 /* ===== */
 ,
-"78.46.85.216 orport=9001 id=9738F8F5C386CDAF5707D0DCED428F2813CA285F"
-" ipv6=[2a01:4f8:120:1381::2]:9001"
-/* nickname=astolfo */
+"82.103.140.87 orport=443 id=A1B7C1F83E5DA4376FD2E1DBA7AC28A71AB332AD"
+/* nickname=arnall */
 /* extrainfo=0 */
 /* ===== */
 ,
-"104.244.74.28 orport=9001 id=2DB8A946826D0CB4F5C3A8264628DD0F16F6612D"
-/* nickname=a9Exit */
+"37.221.66.248 orport=443 id=A28D6C0BAA9EEBD288713357C46CF6EF081EF673"
+" ipv6=[2001:678:6d4:6020::4dea:105]:443"
+/* nickname=DTFNODE64 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"142.4.213.112 orport=443 id=E12235C7310A4ABED3480E907F6D9BD1DC1E1D6C"
-/* nickname=Unnamed */
+"109.70.100.1 orport=443 id=530277866466A1425F43A73DBFCB5FC7410C9852"
+" ipv6=[2a03:e600:100::1]:443"
+/* nickname=spargel */
 /* extrainfo=0 */
 /* ===== */
 ,
-"68.196.180.5 orport=8443 id=954B2AEA8FDCF0DF701A2EC9285640B929546DF7"
-/* nickname=MrRobotLives */
+"185.82.127.141 orport=9001 id=34FA04EFC21C4B8461FCE82E908FDD53DF1E7962"
+/* nickname=s0menickname */
 /* extrainfo=0 */
 /* ===== */
 ,
-"45.91.67.90 orport=9001 id=023DB955544865BB4D593DE66E89B496777DF0F0"
-/* nickname=lavandeluxe2 */
+"45.76.218.50 orport=9001 id=1FCA426BBD7EDCC6C0FFF013D0FD9531B16A5845"
+/* nickname=myTorRelay2 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"89.212.26.36 orport=9001 id=25A3C92EB11A140B006695D0009F6EAEAF3C6785"
-/* nickname=mrrm87 */
+"54.36.205.38 orport=9001 id=5DB9AE27A44EB7B476CC04A66C67A71C97A001E6"
+/* nickname=Chenjesu */
 /* extrainfo=0 */
 /* ===== */
 ,
-"116.203.245.170 orport=443 id=5EB36D1BFC513A66F52A969AB23456E92D2ABB46"
-" ipv6=[2a01:4f8:c2c:4582::1]:443"
-/* nickname=alpha */
+"185.72.247.145 orport=9001 id=130E69E8F783DEF256E757FA78154B7DC2A39E0E"
+/* nickname=funkturm */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.220.101.13 orport=30013 id=48BE372CA2104D2422D49CD321060E7F697B52D9"
-" ipv6=[2a0b:f4c2::13]:20013"
-/* nickname=relayon0138 */
+"140.78.100.38 orport=5443 id=23D5D8219A8EB7610AB33CFAD589FD72A844356A"
+/* nickname=INSRelay38at5443 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"37.221.198.114 orport=9001 id=FABA6394C790E96812D33689FAE90796FBA79AA8"
-" ipv6=[2a03:4000:9:533::2]:9001"
-/* nickname=fiedlerRelay17 */
+"173.75.39.61 orport=9001 id=023EBBC57BEB7F45473B3DC2AA811FB3AABA4466"
+/* nickname=tconionrelay */
 /* extrainfo=0 */
 /* ===== */
 ,
-"163.172.194.53 orport=9001 id=8C00FA7369A7A308F6A137600F0FA07990D9D451"
-" ipv6=[2001:bc8:225f:142:6c69:7461:7669:73]:9001"
-/* nickname=GrmmlLitavis */
+"185.4.132.135 orport=443 id=A0056E0F3773DD99C1ED298B956A2ACEE1BFB5FD"
+/* nickname=Grexit */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.220.100.243 orport=9100 id=E8AD8C4FDC3FE152150C005BB2EAA6A0990B74DF"
-" ipv6=[2a0b:f4c0:16c:13::1]:9100"
-/* nickname=F3Netze */
+"104.244.77.250 orport=443 id=E312A938D71045BE3A5C1FF3AB87CF7464194861"
+" ipv6=[2605:6400:30:faa9:4abe:8b09:7ef9:18e6]:443"
+/* nickname=Daenerys */
 /* extrainfo=0 */
 /* ===== */
 ,
-"198.245.49.6 orport=443 id=15B434A2AC13ADE9E3F7EE6C0A740A377300F1D0"
-/* nickname=Unnamed */
+"45.67.229.37 orport=9001 id=34F2DBF5595FF8323665BEC7DD8D2D28F9697B2C"
+/* nickname=Pickachu */
 /* extrainfo=0 */
 /* ===== */
 ,
-"78.194.37.29 orport=9001 id=625743FAF41B791AAFC2D4BF859DA4AAA2E81FE7"
-/* nickname=Zion */
+"193.108.117.103 orport=9001 id=438F3EA4C9FB0DB63F5377A3271AB5435FAD7E04"
+/* nickname=dolemite */
 /* extrainfo=0 */
 /* ===== */
 ,
-"89.163.128.28 orport=9001 id=2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC"
-" ipv6=[2001:4ba0:ffff:237::babe]:9001"
-/* nickname=Doedel24 */
+"158.101.138.180 orport=443 id=B1A0F1143789466AADD5FAE5948C8138548EECEC"
+" ipv6=[2603:c021:8000:d00::c1]:443"
+/* nickname=KagamineLenWoRd */
 /* extrainfo=0 */
 /* ===== */
 ,
-"174.127.169.233 orport=9001 id=4E9796481C1E75F75D57E8C1FC8C8ED111433316"
-/* nickname=brwyatt2 */
+"110.141.223.194 orport=9001 id=1619F4FCE1C5324CAB703EAD94285B1ABE39F912"
+/* nickname=PCGGRelay */
 /* extrainfo=0 */
 /* ===== */
 ,
-"45.79.70.147 orport=9001 id=7DB8443AE29FBC450D34E55FA914F42BF929EE49"
-" ipv6=[2600:3c01::f03c:92ff:fe97:5ebe]:9001"
-/* nickname=1chandotus */
+"104.149.139.42 orport=8080 id=270EECB837AD914C01ACC777152AEEB1EBCDBDE5"
+/* nickname=Phoenix */
 /* extrainfo=0 */
 /* ===== */
 ,
-"51.68.173.83 orport=9001 id=1E70B9253E33D32F69B380B7C5AB0475F22DD349"
-/* nickname=Unnamed */
+"58.107.88.237 orport=9001 id=0D8877392F2FF5AD8D8E5BC438087F02EF97B904"
+/* nickname=Starlight */
 /* extrainfo=0 */
 /* ===== */
 ,
-"104.244.79.121 orport=443 id=570520A8DB8D2BAA95A8AB438C7FB61FE9555746"
-/* nickname=doukai */
+"198.245.61.171 orport=443 id=B1AE47B97B6952B3B8B2CD19B57183CF5C801348"
+/* nickname=Unnamed */
 /* extrainfo=0 */
 /* ===== */
 ,
-"147.135.112.139 orport=9001 id=E0023AC14180112A2FFF00A84C6049862BB3E6C3"
-/* nickname=DerrickJensen */
+"198.211.40.226 orport=9001 id=CB5700E1FB46FC98251DD8F0852B63A3B78DB830"
+/* nickname=jaalkabil */
 /* extrainfo=0 */
 /* ===== */
 ,
-"37.187.98.185 orport=22 id=342A1AC764D89248E66458C077CFF668D05FFF34"
-" ipv6=[2001:41d0:a:22b9::1]:22"
-/* nickname=aergia */
+"94.130.200.167 orport=443 id=CD39C258265B25EAA4ABA4FDCB2DF98104CAA362"
+/* nickname=normaray */
 /* extrainfo=0 */
 /* ===== */
 ,
-"51.75.82.166 orport=443 id=7B57933E29D520471D7E67AB48B06B62832828F9"
-/* nickname=sandman1 */
+"136.243.60.188 orport=9001 id=675CFAC38BE3C9A26C3A2DD7CBC0E616F68624CA"
+" ipv6=[2a01:4f8:212:1b8b:3::8]:9001"
+/* nickname=mullbinde5 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.86.150.58 orport=9001 id=8E76F1F6E8499CCE975C451560586A5F8BF0BFDB"
-/* nickname=JimmyBulanik */
+"81.28.206.216 orport=9001 id=BC5F00B573D277C4BFA8F0FBAA47E074D0994C1C"
+/* nickname=fs0ciety */
 /* extrainfo=0 */
 /* ===== */
 ,
-"91.219.236.197 orport=443 id=1D97A312D98C4D677112265659BD69A83C3AF9E4"
-/* nickname=BeAnon */
+"78.198.147.227 orport=9001 id=867982ADCFBE55EC1C00A5B34C8991FF87605906"
+/* nickname=roTor */
 /* extrainfo=0 */
 /* ===== */
 ,
-"31.131.4.171 orport=443 id=AED4A69836630A3375845006B5AAD03BFA3F96DC"
-/* nickname=1torexit */
+"23.239.113.101 orport=443 id=F98A70E5427BFF111640011F7AE31E537ECF1DD2"
+/* nickname=MarinAsagi */
 /* extrainfo=0 */
 /* ===== */
 ,
-"209.141.40.46 orport=443 id=68514D6AF3A500C61E5C8A03B0C1E1ADDAC62462"
-/* nickname=spotyor */
+"173.212.219.49 orport=6666 id=0A5476625BAC0573A82FCB432ACED70E1ED83E93"
+" ipv6=[2a02:c207:2047:1305::1]:6666"
+/* nickname=OhYee */
 /* extrainfo=0 */
 /* ===== */
 ,
-"2.230.193.197 orport=9003 id=A9EDB4EBF9EF5F3A129A58AE28EF92DB4B5078A3"
-/* nickname=FreeTurkey */
+"52.205.15.239 orport=9001 id=87AA1BE4A39529DD86194738DFB59DC698F3136B"
+/* nickname=BarryBen */
 /* extrainfo=0 */
 /* ===== */
 ,
-"104.244.74.121 orport=9100 id=2EC5EE348BD8D9D2E518B2CAEA9C671E2D5F77A6"
-" ipv6=[2605:6400:30:f6ed:c6a7:9997:d411:cb21]:9100"
-/* nickname=Quetzalcoatl */
+"68.71.27.78 orport=9001 id=262B0B749C9088446A5521C4E98173DED815FD5A"
+/* nickname=ALiteralBird */
 /* extrainfo=0 */
 /* ===== */
 ,
-"152.89.104.206 orport=9001 id=DD0AA66DD9E4E71FFAFAB658DF8300F1CEEA0364"
-" ipv6=[2a03:4000:39:45c:241f:53ff:fe4e:45e9]:9001"
-/* nickname=flowjob04 */
+"185.162.251.135 orport=9001 id=166850D169CC7956E77525A1A9228BC4563CFC8B"
+" ipv6=[2a03:4000:1a:5c5:38dc:87ff:fe07:85fb]:9001"
+/* nickname=Piratenpartei10 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"114.108.58.201 orport=443 id=412767ECB0CEF7DCBAF8748DDBA8575860DD6782"
-/* nickname=winterferien */
+"157.90.38.9 orport=443 id=42A51FFF7AB2A2F396CB924B56676F09BCB52245"
+/* nickname=SoySauceR */
 /* extrainfo=0 */
 /* ===== */
 ,
-"68.67.32.32 orport=9001 id=3DB72310F6999555E71A09C3FCDF86E8E99118F7"
-/* nickname=hKnYTKYgoYx4JmnAwu9 */
+"217.79.178.53 orport=444 id=9C1559C46AD0279EEF6FD187E1B27D939C303086"
+" ipv6=[2001:4ba0:cafe:5bf::1]:444"
+/* nickname=JanKuciak */
 /* extrainfo=0 */
 /* ===== */
 ,
-"107.189.30.230 orport=9001 id=B12536F2F1BBFE0B47FAAD0D5D05BFAEC6C2DE9F"
-/* nickname=Hydra40 */
+"195.154.112.228 orport=9001 id=CC2DD888299ED7B7CA7D7B930352A074EBE1E906"
+/* nickname=justarandomrelay */
 /* extrainfo=0 */
 /* ===== */
 ,
-"51.178.26.103 orport=443 id=FFF4E4F51077370085A339B1F81A02BF3C2F52C9"
-" ipv6=[2001:41d0:305:2100::8550]:443"
-/* nickname=corvuscorax */
+"91.194.84.89 orport=8443 id=1AAC19D892F84910AB94C45092241ABA3CFC4C89"
+" ipv6=[2001:4ba0:ffff:1ce::2]:8443"
+/* nickname=ForPrivacyNET */
 /* extrainfo=0 */
 /* ===== */
 ,
-"192.166.245.82 orport=443 id=8E8A46FADE96BFEA4F16CC23A25ADC05E00AE1AB"
-/* nickname=DTFNODE28 */
+"159.196.69.117 orport=9001 id=B9A8969537739F89CBB02E2A91CECFE154B276C7"
+/* nickname=Aurora */
 /* extrainfo=0 */
 /* ===== */
 ,
-"95.217.15.17 orport=443 id=1A10F6E2BA45CA4A5EBAA6EF759FCBF4E8AFEEA8"
-" ipv6=[2a01:4f9:c010:7066::1]:443"
-/* nickname=bias */
+"46.38.236.250 orport=9001 id=20974D28EB668E689D4256046E0E32034375A0A2"
+" ipv6=[2a03:4000:2:ba4:88e9:eff:fe89:3637]:9001"
+/* nickname=cvbnet1 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"199.249.230.189 orport=443 id=521C30A968743B13E17E22E39BE52DA020FB92E1"
-" ipv6=[2620:7:6001::189]:80"
-/* nickname=Quintex100 */
+"209.141.39.200 orport=443 id=D0F40C637C5F93D823AAC497007FD07A2F0FABB5"
+" ipv6=[2605:6400:20:21de::1]:443"
+/* nickname=HogTheHedges */
 /* extrainfo=0 */
 /* ===== */
 ,
-"109.70.100.15 orport=443 id=DE847D94E78B2E560AB87D272DC90192D3144F17"
-" ipv6=[2a03:e600:100::15]:443"
-/* nickname=kohlrabi */
+"5.135.156.12 orport=4899 id=5558F546D2A996DD2F4B6A62A218DF23848452E3"
+/* nickname=jakfrancjamoze */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.73.211.3 orport=50001 id=8699371415DC052A60BCA3AAD68E55D9B759CAE0"
-" ipv6=[2a00:8dc0:aa00::13]:50001"
-/* nickname=torrorist */
+"83.161.151.178 orport=9001 id=A98ADD972045D3CCAEE65C788C3F175BAEA3E324"
+/* nickname=2Contribute */
 /* extrainfo=0 */
 /* ===== */
 ,
-"37.187.21.49 orport=9001 id=15483893699246724B8135CC6F087767EA89A2D3"
-" ipv6=[2001:41d0:a:1531::1]:9001"
-/* nickname=rackhamsaltair */
+"85.214.141.24 orport=9001 id=BCC93B0ACA325374086A5100D02843A04EBDCC00"
+" ipv6=[2a01:238:420e:ae00:1c37:63c1:24c0:ff75]:9001"
+/* nickname=tor1VaxariNet */
 /* extrainfo=0 */
 /* ===== */
 ,
-"67.3.168.113 orport=443 id=EC4B6AF202EFE752C4D9E2FBD092C4EAE779ADA1"
-/* nickname=Unnamed */
+"199.195.250.77 orport=443 id=58B44B5591A96EC08114B041CC6B1BB1521DF2BE"
+" ipv6=[2605:6400:10:549::1]:443"
+/* nickname=UnvisitedNativity */
 /* extrainfo=0 */
 /* ===== */
 ,
-"5.189.148.225 orport=9001 id=5F48BA138AC6F7B42CC7A0B0D4012541DFEB9677"
-/* nickname=TrafficAdvanceNetw */
+"185.100.87.250 orport=8443 id=ABD9D46C3C026CF6B88574A0707D0BF75A067999"
+" ipv6=[2a06:1700:0:12::1]:8443"
+/* nickname=artikel10buc01 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"213.183.60.21 orport=443 id=39F91959416763AFD34DBEEC05474411B964B2DC"
-" ipv6=[2a06:f904:1:100::4b]:443"
-/* nickname=rinderwahnRelay11L */
+"178.20.55.16 orport=443 id=EFAE44728264982224445E96214C15F9075DEE1D"
+/* nickname=marcuse1 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"54.38.92.43 orport=9001 id=63540827C4832D214984EA47B7A68C593F9F862F"
-/* nickname=Unnamed */
+"151.237.185.134 orport=9001 id=1BBD716B4973D96E570D334A5776978BFF7E0E5D"
+/* nickname=lecirque */
 /* extrainfo=0 */
 /* ===== */
 ,
-"178.20.55.16 orport=443 id=EFAE44728264982224445E96214C15F9075DEE1D"
-/* nickname=marcuse1 */
+"213.164.218.224 orport=443 id=3C7F402F5C62A96C7E0DCD5CC850AADF88393802"
+/* nickname=Chani */
 /* extrainfo=0 */
 /* ===== */
 ,
-"37.187.102.108 orport=443 id=F4263275CF54A6836EE7BD527B1328836A6F06E1"
-" ipv6=[2001:41d0:a:266c::1]:443"
-/* nickname=EvilMoe */
+"51.83.131.42 orport=9001 id=8F293A6484A0973167B15C4997AB9F24C21143FE"
+/* nickname=Hydra24 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"51.15.65.243 orport=443 id=9B5ED3370E002AEBB2A9B25E3213C1817CCD2D88"
-" ipv6=[2001:bc8:1830:180b::1]:443"
-/* nickname=fleischgewehr */
+"172.105.89.143 orport=9007 id=26C15ED5282382A843D0774F5170BCCCCCC46D63"
+" ipv6=[2a01:7e01::f03c:92ff:fe7c:85f7]:9007"
+/* nickname=BestofbestBackup */
 /* extrainfo=0 */
 /* ===== */
 ,
-"188.126.83.38 orport=443 id=E0A3471C24C9021CC58FBF774203046FD2BC893F"
-/* nickname=redsox */
+"179.43.169.20 orport=443 id=65E40F7EDD28E2CF28684E30E0BAB7706819CFC3"
+/* nickname=Fangio */
 /* extrainfo=0 */
 /* ===== */
 ,
-"151.115.56.33 orport=443 id=91094CEBDA0C921923EA4213A209B14216F09AC1"
-/* nickname=ENC2WAW1984 */
+"174.89.83.82 orport=9001 id=C8705CB63A3D3060A649D9FA0514E7E60A1E1A2B"
+/* nickname=metM0r */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.220.101.137 orport=10210 id=28F4F392F8F19E3FBDE09616D9DB8143A1E2DDD3"
-" ipv6=[2a0b:f4c2:1::137]:10210"
-/* nickname=relayon0210 */
+"68.160.242.214 orport=9001 id=6111C6005AB56498BE5E35666B2522CEBE17D14E"
+/* nickname=jsRelay */
 /* extrainfo=0 */
 /* ===== */
 ,
-"46.194.163.28 orport=65534 id=7BE9E2EF2BB41BB662D9A3CD68289B9E3DBF8A08"
-/* nickname=WYSWYG */
+"144.76.216.252 orport=9001 id=6B88E20FEE8EB47F1A8E30207F327005C61A013D"
+" ipv6=[2a01:4f8:200:8261::b0]:9001"
+/* nickname=slacknet */
 /* extrainfo=0 */
 /* ===== */
 ,
-"85.214.196.178 orport=9001 id=EAD250EE6D1BDB1BBACFFD1C3C262D59FD55A41A"
-" ipv6=[2a01:238:4306:cf00:ec59:d2a4:ac11:336]:9050"
-/* nickname=Zwiebelring */
+"209.141.54.168 orport=443 id=A66E5782FE6097D2824044466776FE912AEFD85B"
+" ipv6=[2605:6400:20:274::1]:443"
+/* nickname=alxu2 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"23.129.64.133 orport=443 id=FC773D88785CF34CF0028BA13C5CBD32CAB27AE2"
-" ipv6=[2620:18c:0:192::133]:443"
-/* nickname=undervillian */
+"107.189.31.241 orport=9100 id=82CE42D04B5BA616E611E4758861C864B2ACFCA8"
+" ipv6=[2605:6400:30:f02a:faff:1d57:32b7:157f]:9100"
+/* nickname=Quetzalcoatl */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.220.101.14 orport=10014 id=957354D72042719C310A907FBFE42A3232C78757"
-" ipv6=[2a0b:f4c2::14]:10014"
-/* nickname=relayon0142 */
+"123.255.62.137 orport=9001 id=803FB98BA0FE1709C087E9138CC6096F22083CA5"
+/* nickname=Damnation */
 /* extrainfo=0 */
 /* ===== */
 ,
-"188.127.226.102 orport=110 id=B05B3AB0159238FB7AEB1BF08A406D6F31A45ADF"
-" ipv6=[2a06:dd00:1:12:a11:90d5:be:11e5]:110"
-/* nickname=eludemailrelay */
+"5.56.221.113 orport=4020 id=605EE4375EE4C38215C8949F5808863749FD4F4A"
+/* nickname=arcanum */
 /* extrainfo=0 */
 /* ===== */
 ,
-"45.33.46.101 orport=9001 id=07623013C3361FE566B71C8CFCC6483D7587A827"
-/* nickname=FreedomFries01 */
+"24.151.37.55 orport=42069 id=343EC037D633150AFFCC8471E805AABAE1B1D871"
+/* nickname=BringMeToLife */
 /* extrainfo=0 */
 /* ===== */
 ,
-"116.203.23.183 orport=9001 id=5D377009B7538DE1423C4FBEB82370040394A9FF"
-" ipv6=[2a01:4f8:c0c:ae0c::1]:9001"
-/* nickname=SCSYSTEMSRELAY01 */
+"212.74.233.22 orport=9011 id=66B06D59BDFC90EBC6EDE79C558275F2CD4799B0"
+/* nickname=daytoner */
 /* extrainfo=0 */
 /* ===== */
 ,
-"140.78.100.43 orport=8443 id=BC6E80744314F16054A64EE0F2302F082C929958"
-/* nickname=INSRelay43at8443 */
+"185.32.221.201 orport=443 id=03DC081E4409631006EFCD3AF13AFAAF2B553FFC"
+/* nickname=krigernes */
 /* extrainfo=0 */
 /* ===== */
 ,
-"78.46.202.212 orport=9010 id=28D20B990E48FCA20857DBDF12997C323C125124"
-" ipv6=[2a01:4f8:c0c:162b::1]:9010"
-/* nickname=dvbhorst */
+"199.249.230.166 orport=443 id=1BBCAEB763CA46DEB565A7251FAA6AC79A388ADD"
+" ipv6=[2620:7:6001::166]:80"
+/* nickname=Quintex77 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"80.100.69.97 orport=9001 id=19083549B3F2BFD96FAACA934D7872CD578A8B99"
-/* nickname=raspitor3 */
+"92.38.163.65 orport=9001 id=C8AAADD3FD1470E7D60D8BC4500F95825F35057D"
+" ipv6=[2a03:90c0:83:2908::169]:443"
+/* nickname=Lux4 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"89.163.128.26 orport=9001 id=8FA37B93397015B2BC5A525C908485260BE9F422"
-" ipv6=[2001:4ba0:ffff:237::abba]:9001"
-/* nickname=Doedel22 */
+"193.111.26.37 orport=443 id=C9D02B1644BD47C136E379FDFAF4973D1A1CE07C"
+/* nickname=8af34cb1 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"38.39.192.78 orport=443 id=A96DA63E4415E776FBFCCF3DA7154C804534B6E7"
-/* nickname=3735928559 */
+"132.226.162.148 orport=9001 id=45047C78E1F5E7B775B0A42F118D4ED64504D09E"
+" ipv6=[2603:c021:c003:3511:1::]:9001"
+/* nickname=plithismos */
 /* extrainfo=0 */
 /* ===== */
 ,
-"201.114.166.24 orport=9001 id=C0417071C3754885296F4A5935AC1BC1CABDBC31"
-/* nickname=toritoinfinito */
+"185.220.102.250 orport=993 id=35B503FB546815CC9EDE91022555B5D0ED04E389"
+" ipv6=[2a0b:f4c1:2::250]:993"
+/* nickname=Digitalcourage4ip3b */
 /* extrainfo=0 */
 /* ===== */
 ,
-"52.214.94.163 orport=9001 id=430672CD7162FA88AB49D891C38567799F346333"
-/* nickname=Isidore */
+"95.216.145.127 orport=9001 id=5EF0AAAEEE7B1282DA0DBAB94669B73E39DD51B6"
+/* nickname=MyCoolNick */
 /* extrainfo=0 */
 /* ===== */
 ,
-"195.176.3.24 orport=8443 id=8C25BA134D579B8AAF420E01215EB2CF06AAE907"
-" ipv6=[2001:620:20d0::24]:8443"
-/* nickname=DigiGesTor5e4 */
+"84.160.69.190 orport=9001 id=1388AB40396F57ED95BB6036E6504CE8E0F622B8"
+/* nickname=BurnerMeetsTOR */
 /* extrainfo=0 */
 /* ===== */
 ,
-"37.191.195.28 orport=8443 id=BB004C7F4C5C9FAE5E001864537F89388444F572"
-/* nickname=Unnamed */
+"178.17.173.26 orport=9001 id=7332A06B00D6AF54AA804F03C624DFBBC9E66172"
+" ipv6=[2a00:1dc0:2451:10::3]:9001"
+/* nickname=MoldEraTor */
 /* extrainfo=0 */
 /* ===== */
 ,
-"72.132.134.217 orport=443 id=188FC071EBD1901AFEAFC68603C63D43F989709F"
-/* nickname=anomaly */
+"172.222.102.43 orport=9001 id=C8A8423DDB3C7E62D0F2A7A88B09BA68710B6AF2"
+/* nickname=margate */
 /* extrainfo=0 */
 /* ===== */
 ,
-"104.178.168.242 orport=9001 id=AB6072166366C2E245F95905310431357B581F9C"
-" ipv6=[2600:1700:c0:5678::9001]:9001"
-/* nickname=AaronSwartz */
+"5.45.104.171 orport=22 id=D30734EC319A37E15155F6B710E9CC8F987FC772"
+" ipv6=[2a03:4000:6:1547:92dc:911c:7899:e0f2]:22"
+/* nickname=Unnamed */
 /* extrainfo=0 */
 /* ===== */
 ,
-"45.14.233.160 orport=443 id=DDC3D816F2B229CEFF613E4D912CD79EE34024EF"
-" ipv6=[2a0e:1580:1000::2dff:fe0e:e9a0]:443"
-/* nickname=mikrogravitation03 */
+"37.120.184.36 orport=9001 id=A7317673B923B591066204FFD299AB2C4150B6BE"
+" ipv6=[2a03:4000:f:512:8475:54ff:fefe:912d]:9001"
+/* nickname=Piratenpartei12 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"217.112.131.98 orport=9001 id=F604131DCC4303E51DB876A017A3DC9684FD626B"
-/* nickname=oromis */
+"173.208.141.58 orport=8443 id=8D3BF2751B2C7857839B2E597EB9E092FB583506"
+" ipv6=[2604:4300:a:5b:bad:babe:ca11:911]:8443"
+/* nickname=c0rexxxkratos */
 /* extrainfo=0 */
 /* ===== */
 ,
-"193.11.164.243 orport=9001 id=FFA72BD683BC2FCF988356E6BEC1E490F313FB07"
-" ipv6=[2001:6b0:7:125::243]:9001"
-/* nickname=Lule */
+"62.65.40.250 orport=443 id=6009023303F6881419F4CEDFC4B7FF8FFDF2E3C3"
+/* nickname=a2704f1ae50d753145e */
 /* extrainfo=0 */
 /* ===== */
 ,
-"139.162.232.28 orport=9001 id=86FBA753C8D25653E086B98FFF8AA084F862DB67"
-" ipv6=[2a01:7e00::f03c:91ff:febb:4d59]:9001"
-/* nickname=Potatoe */
+"91.143.85.52 orport=465 id=FA85FE81093FE5D53DDCEA2DBA286E8CCC9C6DDD"
+" ipv6=[2a02:180:6:1::2efe]:465"
+/* nickname=Planetclaire64 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"82.170.235.23 orport=9111 id=D4EC393C60D1A1AE39C09DF42F48664CF1DD7A36"
-/* nickname=yawlimit */
+"37.218.241.28 orport=9001 id=14D2FDC6ABDCD1A27CA32D13AA2C68566D1E8223"
+/* nickname=OONITestHelper */
 /* extrainfo=0 */
 /* ===== */
 ,
-"85.195.235.248 orport=9001 id=103336165A0D2EFCAD3605339843A0A7710B8B92"
-" ipv6=[2a02:168:a403:13:5054:ff:fe21:7c4c]:9001"
-/* nickname=RelayStation */
+"163.172.94.119 orport=9001 id=E459E02374D0385D2E2515CBBE707EA208966BCF"
+" ipv6=[2001:bc8:208a::1]:9050"
+/* nickname=AsiaArgento */
 /* extrainfo=0 */
 /* ===== */
 ,
-"89.163.128.25 orport=9001 id=AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2"
-" ipv6=[2001:4ba0:ffff:237::10cc]:9001"
-/* nickname=Doedel21 */
+"91.121.82.132 orport=9001 id=87D28EE0C993B250EF93DBE4D2CB0E30244D757C"
+/* nickname=Hack2G2 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"51.75.129.204 orport=443 id=2CE9BE1FC88B9D0FA03F387C9E4F000B5D4B2AE9"
-/* nickname=ridin */
+"62.210.123.24 orport=443 id=2EB3C230180694A1E848001E20F36F76A2287039"
+" ipv6=[2001:bc8:30c6:100::dead]:443"
+/* nickname=Alastor */
 /* extrainfo=0 */
 /* ===== */
 ,
-"95.154.24.73 orport=9001 id=716EE92A2E93ED69113D8F81E98530BA9A30DC31"
-" ipv6=[2001:470:1f15:770::2]:9001"
-/* nickname=Air7jyl */
+"192.222.169.71 orport=9001 id=B5B666F5F7E910DFF44AD58CD62A4B3F415ECB60"
+/* nickname=TORRelayCAN */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.220.101.12 orport=30012 id=906DCB390F2BA987AE258D745E60BAAABAD31DE8"
-" ipv6=[2a0b:f4c2::12]:20012"
-/* nickname=relayon0132 */
+"95.217.30.201 orport=443 id=E7A3DA42BCA86430F089DD32C3FDA33534E76F19"
+" ipv6=[2a01:4f9:c01f:30::1]:443"
+/* nickname=waveguide01 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"108.16.117.27 orport=7936 id=3314200AC2BF60FFD828114F4A23D444834F14DB"
-/* nickname=Unnamed */
+"51.159.144.243 orport=443 id=32364BEF873944BE481E8BCC7FAE9297F5F39781"
+/* nickname=tirz */
 /* extrainfo=0 */
 /* ===== */
 ,
-"23.105.163.117 orport=443 id=1E825573F8EFD5635E5C1E3B85CA647CFC84BA83"
-/* nickname=GoodColours */
+"212.227.165.251 orport=9001 id=083C52051140DB8AF770BD40C7C8883EFFF4CAF3"
+/* nickname=NAKAM */
 /* extrainfo=0 */
 /* ===== */
 ,
-"140.78.100.15 orport=8443 id=70882B116C73BE323036D824315A050EE796C445"
-/* nickname=INSRelay15at8443 */
+"93.95.88.13 orport=9001 id=4B1730254163346F434DE185BBA51B62D9074FC4"
+" ipv6=[2a02:2780::e01a]:9001"
+/* nickname=ZXSpectrum */
 /* extrainfo=0 */
 /* ===== */
 ,
-"195.206.105.227 orport=13526 id=158D411B51D313456D45EF66D099585976CCDD6F"
-/* nickname=RToRpi */
+"104.244.72.168 orport=9100 id=CDF6AECEA9A9092CA9859A78652AE60D359A44F6"
+" ipv6=[2605:6400:30:fb03:b137:4c52:b2b1:2c98]:9100"
+/* nickname=Quetzalcoatl */
 /* extrainfo=0 */
 /* ===== */
 ,
-"91.208.162.203 orport=9001 id=7555DBD9732EF66F0F084C41DFDA401B6D036505"
-/* nickname=gbhfmoldrelay */
+"198.73.50.66 orport=443 id=1CAFE6E87EE8BBA354DC5647C6E183D8B8AF20EC"
+/* nickname=KaplanCS6 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"212.47.254.236 orport=443 id=C91102131E6B9CECFC56C4A29ADA4E638D7872F7"
-/* nickname=torpidsFRonline1 */
+"209.141.38.62 orport=443 id=60B2A557B6B9FB8CBF8168AA93FD24D8CCE815D7"
+/* nickname=ElectricSoda */
 /* extrainfo=0 */
 /* ===== */
 ,
-"51.15.41.39 orport=443 id=E9BFB31EE1D7060EFAE4A52C2A148D9C4974A7C3"
-" ipv6=[2001:bc8:1824:326::1]:443"
-/* nickname=SpookyRooster */
+"109.236.86.109 orport=110 id=768B488AE2C61B6FA837E3AB8DB7601E1A0B8492"
+" ipv6=[2a00:7c80:0:1b0:a11:90d5:be:11e5]:110"
+/* nickname=eludemailrelay */
 /* extrainfo=0 */
 /* ===== */
 ,
-"51.158.147.144 orport=443 id=ADBED8B751D7D63397FF3300BB3DE76141AA168F"
-/* nickname=Unnamed */
+"192.42.116.161 orport=9001 id=C804BE8FB1C7C42D43C4A5E2039E77AA0FF3A8B4"
+" ipv6=[2001:67c:6ec:203:192:42:116:161]:9001"
+/* nickname=geefMvanjetje */
 /* extrainfo=0 */
 /* ===== */
 ,
-"45.125.166.58 orport=443 id=6F1A2314C4A1ADEDFB7D419B6BB10D7BC40119F6"
-/* nickname=leysen */
+"31.13.195.248 orport=443 id=7EF6E998564211FB86881FEA2627AA9119BD9842"
+/* nickname=MaiaAlston */
 /* extrainfo=0 */
 /* ===== */
 ,
-"45.153.160.130 orport=9001 id=D9EFB3D96A7C2E93AA7CC539086D6E1DD39455B1"
-" ipv6=[2a0f:9100:110:a::82]:9001"
-/* nickname=Walker */
+"37.191.195.28 orport=8443 id=BB004C7F4C5C9FAE5E001864537F89388444F572"
+/* nickname=Unnamed */
 /* extrainfo=0 */
 /* ===== */
 ,
-"195.123.212.228 orport=9001 id=950134F4ABA3291EEE4E7A2F26546DB7070776A4"
-" ipv6=[2a02:27ac::245]:9001"
-/* nickname=FakeVolleyball */
+"23.154.177.2 orport=443 id=2A0F47CE7E1C0B7DE6FF2B3AD05DB0E77A876D98"
+/* nickname=UnredactedManning */
 /* extrainfo=0 */
 /* ===== */
 ,
-"198.98.57.207 orport=443 id=A00E900534DFF76371064C03714753EAF8B88820"
-" ipv6=[2605:6400:10:449:d588:761:3910:8268]:443"
-/* nickname=FriendlyExitNode5 */
+"51.178.26.103 orport=443 id=FFF4E4F51077370085A339B1F81A02BF3C2F52C9"
+" ipv6=[2001:41d0:305:2100::8550]:443"
+/* nickname=corvuscorax */
 /* extrainfo=0 */
 /* ===== */
 ,
-"104.238.167.111 orport=443 id=C5BF27560E4B007365FBA96D32F9E74614218C8E"
-/* nickname=stoychev */
+"51.81.56.74 orport=443 id=A1A2924158198592C3E88CB0DF23C14D9FE64328"
+/* nickname=sandstorm */
 /* extrainfo=0 */
 /* ===== */
 ,
-"83.97.87.182 orport=9051 id=28B39D67BD18D13694DE03679EA4A864EB6977E9"
-/* nickname=th00ht */
+"195.154.133.124 orport=9001 id=288DA2F27E30BC73FC8A84367696C9DF6B4C1B90"
+/* nickname=Pleiv */
 /* extrainfo=0 */
 /* ===== */
 ,
-"195.154.243.182 orport=443 id=55F3D29D53F3ABB6CF2F6C2FBE8D6A1B131D0275"
-/* nickname=Unnamed */
+"176.9.118.73 orport=9993 id=5F58E9417DF94A66529864FA1134635614958A44"
+/* nickname=ThereIsNoCowLvl */
 /* extrainfo=0 */
 /* ===== */
 ,
-"91.160.55.21 orport=9001 id=954A874584F009EB7D14D48362FF9AEF82FF6200"
-" ipv6=[2a01:e0a:d:c540:4bfe:636b:b21c:42cf]:9001"
-/* nickname=myNicething475b */
+"79.196.30.109 orport=9005 id=23605ADE16298CA152CC62F0C7593B3EB57BD0F4"
+/* nickname=Nightosphere */
 /* extrainfo=0 */
 /* ===== */
 ,
-"94.142.241.194 orport=9004 id=C03209F54BC299927CA7581147434F439F37CACB"
-" ipv6=[2001:678:688:2::2]:9004"
-/* nickname=VrijHeid4 */
+"24.3.110.224 orport=443 id=C542D452D42DBD01A071D2DA1CE6EE15AF40F5C2"
+/* nickname=meatloaf229 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"144.91.125.239 orport=9001 id=525EE34C1A7B89AB9DF585246DE30E32702913F5"
-/* nickname=t1r */
+"78.94.141.180 orport=15827 id=503431F94FF8FB69F10AD59DE31F3B2C3449D990"
+" ipv6=[2001:470:704c::3]:15827"
+/* nickname=ParckwartEfatsum */
 /* extrainfo=0 */
 /* ===== */
 ,
-"94.23.194.134 orport=443 id=7E8BC43AE75EAE16D7EC4676F4A5C355F454B809"
-/* nickname=minotorus */
+"45.129.3.215 orport=9002 id=A6D2C788EE9468127151A732C090674AEB0C220C"
+" ipv6=[2a00:b700::8:2bb]:9001"
+/* nickname=NameIsNotHere */
 /* extrainfo=0 */
 /* ===== */
 ,
-"198.50.128.237 orport=9001 id=D7A80E95892AAF51FF24CF7C2CE49311931B55F7"
-/* nickname=goodvikings */
+"94.212.41.237 orport=9001 id=AEB2339CC5507533E4BDF91CB53FA130A4A72DE7"
+/* nickname=KoenzkTorRelay1 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"80.208.150.185 orport=9001 id=8A2CCF9A354EF89C08CB0AE2DD7F7E8418ADF713"
-/* nickname=idideditheconfig */
+"185.100.87.250 orport=9443 id=072E2883854ADA0C6B0FC1497544E529D9FD8373"
+" ipv6=[2a06:1700:0:12::1]:9443"
+/* nickname=artikel10buc02 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"192.36.38.33 orport=443 id=54DE63F4587058B79152A75A0238D7F7A0279215"
-/* nickname=uzieka */
+"50.7.178.34 orport=443 id=40FAE4540CF4C126B1B15C0F5E048FDBD66E2D88"
+/* nickname=fennee */
 /* extrainfo=0 */
 /* ===== */
 ,
-"107.174.244.102 orport=9001 id=22658368E5AA075AEAACC19075ADC19670A77165"
-/* nickname=Assange021usX */
+"164.132.226.30 orport=22 id=0AC3C86BC9CA2A50C7762EF42ABC6D37575ACFFB"
+" ipv6=[2001:41d0:401:3100::7fda]:22"
+/* nickname=PieroV */
 /* extrainfo=0 */
 /* ===== */
 ,
-"82.212.170.79 orport=9001 id=45DFAB9E1BD65DEF326CE0CB300E6C6F410A67F8"
-/* nickname=TotorBEx */
+"193.218.118.62 orport=9001 id=FF7C2604EFEE8B5898FDE1145A4CA35C8E5E5607"
+" ipv6=[2a0f:e586:f:f::62]:9001"
+/* nickname=Hydra1 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"2.29.35.45 orport=9001 id=155513DAF42E18FA16FCE77D08417E460785A95B"
-/* nickname=mac68tm */
+"140.78.100.18 orport=5443 id=B65EBC8D596BBCAD0AF6092C733C00872959FD68"
+/* nickname=INSRelay18at5443 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"198.255.21.2 orport=443 id=6078F300B379D8DEBCF02DBE80881C94777E24BF"
-/* nickname=Handlebar */
+"95.217.15.17 orport=443 id=1A10F6E2BA45CA4A5EBAA6EF759FCBF4E8AFEEA8"
+" ipv6=[2a01:4f9:c010:7066::1]:443"
+/* nickname=bias */
 /* extrainfo=0 */
 /* ===== */
 ,
-"198.100.148.106 orport=443 id=1489CEB120B3DF9CDF1EB5152A65F8C5F4B9E0F3"
-/* nickname=Unnamed */
+"107.189.28.100 orport=9100 id=EB3DA93B6FFFA699C1F2714C9E73FA813BB8F822"
+" ipv6=[2605:6400:30:f052:2387:1aef:e178:b3d7]:9100"
+/* nickname=Quetzalcoatl */
 /* extrainfo=0 */
 /* ===== */
 ,
-"51.81.56.229 orport=443 id=A4436E70B8D7E7C5482EFCC55D53D39EC6AE905F"
-/* nickname=vrienden */
+"77.21.74.43 orport=9001 id=2DACC26F1D3BA64F32EEB4185BAD696A88BA832D"
+/* nickname=just1small4relay */
 /* extrainfo=0 */
 /* ===== */
 ,
-"178.17.174.198 orport=443 id=8CA16E878293D11F0E0803E5FC09F93A5C666889"
-/* nickname=Auroch */
+"185.220.103.117 orport=443 id=20BC2F515B5057D598CCC018705E0ECA918E0395"
+/* nickname=SpeedTest2 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"104.200.20.46 orport=9001 id=78E2BE744A53631B4AAB781468E94C52AB73968B"
-" ipv6=[2600:3c00::f03c:91ff:fee2:4963]:9001"
-/* nickname=bynumlaw */
+"172.86.75.174 orport=443 id=101EEFBFCEC4869BA96C0E6AD2B6BBE696D98477"
+/* nickname=JumpOverAlice */
 /* extrainfo=0 */
 /* ===== */
 ,
-"150.136.244.162 orport=9000 id=934788C0B6DB4F1B6C45B1BC9E2EBBC79FFA2CEA"
-/* nickname=realestRelay */
+"51.15.249.137 orport=9030 id=75FB9A4469199F251581061391214ACFDC682EF4"
+/* nickname=NervousEnergy */
 /* extrainfo=0 */
 /* ===== */
 ,
-"192.160.102.165 orport=9001 id=C90CA3B7FE01A146B8268D56977DC4A2C024B9EA"
-" ipv6=[2620:132:300c:c01d::5]:9002"
-/* nickname=cowcat */
+"96.244.79.89 orport=9001 id=ECB5CA114939B51E447792259F467C7D005C0693"
+/* nickname=luigi */
 /* extrainfo=0 */
 /* ===== */
 ,
-"37.221.193.44 orport=9001 id=7DA31D79E52D12685BBE8544E3C557F176B0FC84"
-" ipv6=[2a03:4000:8:3c1::9001]:9001"
-/* nickname=cybr */
+"213.73.96.131 orport=443 id=EE3DDF00C1ADC567F333B9BA819C8F252A32933C"
+/* nickname=gina */
 /* extrainfo=0 */
 /* ===== */
 ,
-"45.91.101.18 orport=9001 id=F42FF0E095F23AD253622272F984649DDEEB402C"
-/* nickname=4punk7e3 */
+"132.252.186.185 orport=443 id=8ABC4D5F6182C7E79B087D1ED9E5CF652C83E52C"
+" ipv6=[2001:638:501:4185:250:56ff:fe85:7034]:443"
+/* nickname=UDEtor */
 /* extrainfo=0 */
 /* ===== */
 ,
-"178.162.194.210 orport=80 id=BBD1B1A22695396C75DFF338A8FF7A12804A607A"
-/* nickname=Blazkowicz */
+"62.212.239.170 orport=80 id=4FC02CB4A624CE730FC4BDCBF60911913C45CEBD"
+/* nickname=thebolt */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.173.179.18 orport=443 id=95C8B9418E74F3FF80E5C3D3AF7F03156FFBBFBE"
-" ipv6=[2a0b:6900:0:1::1d7]:443"
-/* nickname=rinderwahnRelay27L */
+"92.223.72.168 orport=443 id=29FFA7A881ABADCA4EEEDD16128537BB028D5153"
+/* nickname=nati */
 /* extrainfo=0 */
 /* ===== */
 ,
-"93.115.95.38 orport=443 id=3BB035514F8246AC367B5370F4FE120BB11D8C6D"
-/* nickname=kerly */
+"51.254.136.195 orport=443 id=7BB70F8585DFC27E75D692970C0EEB0F22983A63"
+/* nickname=torproxy02 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"68.14.177.196 orport=9001 id=83B5DB940A719B67F5BF616FEEC9D8D4F764D1AB"
-/* nickname=Champions */
+"83.212.72.189 orport=443 id=661E08534FABDBE09BA505F7A73848371C6EF732"
+" ipv6=[2001:648:2ffe:501:cc00:11ff:fe4b:4ba5]:443"
+/* nickname=ExwMiaTigriMesaMou */
 /* extrainfo=0 */
 /* ===== */
 ,
-"65.21.94.13 orport=9001 id=509EAB4C5D10C9A9A24B4EA0CE402C047A2D64E6"
-" ipv6=[2a01:4f9:3b:468e::13]:9001"
-/* nickname=zwiebeltoralf2 */
+"84.113.179.53 orport=9001 id=8D870EED74A4305EEAC5E8CD09F2736837367B12"
+/* nickname=strainerraspi2tor */
 /* extrainfo=0 */
 /* ===== */
 ,
-"46.38.254.223 orport=587 id=7AAEE1FD80A24C377FE62A7A16B5D8042DA009CF"
-/* nickname=openredirect */
+"125.212.220.60 orport=443 id=CF773DE0B4F537BB80DA35643299403B7BF11AFA"
+/* nickname=lader */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.220.101.7 orport=20007 id=619349D82424C601CAEB94161A4CF778993DAEE7"
-" ipv6=[2a0b:f4c2::7]:10007"
-/* nickname=relayon0144 */
+"192.184.145.106 orport=9001 id=8B0D560D2867ADB8CD443ACABD054BEBF831F3D4"
+/* nickname=piftopp */
 /* extrainfo=0 */
 /* ===== */
 ,
-"104.244.73.126 orport=443 id=064D3C4CC1B854839B0979FE1C2F05ABAB7F9D68"
-" ipv6=[2605:6400:30:fa6b::1]:443"
-/* nickname=SanitaryLandslide */
+"104.244.72.65 orport=9001 id=F2DCADFB285DBAD7218E0EFA0598715DBAA8C18D"
+/* nickname=Hydra64 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"179.43.160.164 orport=9001 id=FE88339058BACA3DBB947E3C10C37885A0E2F405"
-/* nickname=HYS2 */
+"158.69.207.216 orport=9001 id=6565F31D9EC0C7DFFEA1920BE3BA4C73EF35B5C4"
+" ipv6=[2607:5300:201:3000::dfc]:9001"
+/* nickname=oscar */
 /* extrainfo=0 */
 /* ===== */
 ,
-"91.245.255.4 orport=443 id=AAD6687B71EDDD12DE38DFEEA1A6B089C91F5EBC"
-" ipv6=[2001:ac8:a:6:0:2:2eea:9949]:443"
-/* nickname=DTFNODE32 */
+"206.217.136.47 orport=443 id=8696DC7AC0470F6ED5C7AC48030002D7D3716FC9"
+/* nickname=TakTor01 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"171.25.193.20 orport=443 id=DD8BD7307017407FCC36F8D04A688F74A0774C02"
-" ipv6=[2001:67c:289c::20]:443"
-/* nickname=DFRI0 */
+"185.65.206.154 orport=443 id=3BB47BFF2788B534A5BACA37879C48EEBE5E8800"
+/* nickname=laruneheureuse */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.38.175.71 orport=443 id=B2380704C53947B1D72E7CBCD361E73901EF7444"
-" ipv6=[2a01:4262:1ab:20::71]:9050"
-/* nickname=Labitat1 */
+"142.4.213.105 orport=443 id=082A6032BD1BB3C95F8DA9F1761F56C21297B2FC"
+/* nickname=Unnamed */
 /* extrainfo=0 */
 /* ===== */
 ,
-"188.68.46.245 orport=9001 id=856B7EFB7E09D02A29DD2FF024B7E1EFE21FE9EB"
-" ipv6=[2a03:4000:22:175:a452:acff:fefc:987f]:9001"
-/* nickname=Piratenpartei02 */
+"37.221.67.70 orport=9001 id=E9EF002E8D2911AFAB1121EF281858484F3ECA73"
+/* nickname=Bastion */
 /* extrainfo=0 */
 /* ===== */
 ,
-"176.123.7.102 orport=443 id=2D2DEFAF19F705EA2978E616F740B771444A4C3D"
-/* nickname=RunningOnFumes5 */
+"212.47.237.127 orport=9001 id=38EF2FCFE72C49C634FE082D6CAB5D8F423B4626"
+/* nickname=KonjikiNoYami */
 /* extrainfo=0 */
 /* ===== */
 ,
-"45.62.210.72 orport=9001 id=30CA5BE503177D8932FB312A49505A5737D8E409"
-/* nickname=nodvrelay17 */
+"54.36.108.162 orport=443 id=46F9FB943917858F618F2648595DEACD931D4400"
+/* nickname=runesandrelics */
 /* extrainfo=0 */
 /* ===== */
 ,
-"37.252.188.180 orport=443 id=18EA6AFA3609A0B24752FBF411A2DAADE27DE129"
-" ipv6=[2a00:63c1:d:180::2]:443"
-/* nickname=C3WEyeOfSauron */
+"158.255.215.41 orport=7654 id=AF2E60DEEA9971F6956A46CE0B6BC94EF558240E"
+/* nickname=saturna */
 /* extrainfo=0 */
 /* ===== */
 ,
-"83.243.68.194 orport=49005 id=DFCDAF8A65F523212B1E4228B61815E72614D25A"
-/* nickname=thorchic */
+"157.131.206.89 orport=443 id=CF4DB0E0480FEB1E8F59C3D774EB9275283D579D"
+/* nickname=GreetingsFromTheNet */
 /* extrainfo=0 */
 /* ===== */
 ,
-"83.212.102.114 orport=29950 id=080BBF9B14454976FDEAD1AD620A04388F5A21F8"
-" ipv6=[2001:648:2ffc:1225:a800:4ff:fe50:934c]:29950"
-/* nickname=AEtherC0r3 */
+"138.201.196.156 orport=9001 id=629DE11D15B760521E1391B2D0722698FDC103DF"
+" ipv6=[2a01:4f8:172:3e5b::2]:9001"
+/* nickname=pilatus */
 /* extrainfo=0 */
 /* ===== */
 ,
-"37.218.242.84 orport=8443 id=9737BEB02DB9FE6A89F2A022081FB7DDAC751AEB"
-/* nickname=atoratvm */
+"45.61.185.90 orport=9000 id=098F98538A21A16332E8C4B724305C2A3496A467"
+" ipv6=[2605:6400:40:febd:48d8:7117:124f:cc45]:9000"
+/* nickname=Quetzalcoatl */
 /* extrainfo=0 */
 /* ===== */
 ,
-"37.191.195.28 orport=44100 id=1D81272219B679D511930499AD8286BCD8F6C445"
+"194.145.150.15 orport=443 id=326853AA78DA467E997E6040ADD0DCFF840E0CB5"
+" ipv6=[2001:1578:200:10::c]:443"
 /* nickname=Unnamed */
 /* extrainfo=0 */
 /* ===== */
 ,
-"178.170.10.3 orport=443 id=699653E5DF094B56775275F8A4F4BFA7C5BD5E2F"
-" ipv6=[2a00:c70:130:1::506]:443"
-/* nickname=TRB1 */
+"95.216.115.85 orport=443 id=22BCD0DFD148209C9860C7F89907AB4DEE974A08"
+/* nickname=Fastnet */
 /* extrainfo=0 */
 /* ===== */
 ,
-"81.6.43.252 orport=9001 id=54A403A1B015F6E5A641AD121530966BD873136E"
-" ipv6=[2a02:169:200:d::15]:9001"
-/* nickname=ulula */
+"134.249.106.21 orport=9001 id=5F6B1DF8C9FA561EC11670C455A4A9188D7F96D9"
+/* nickname=tr297e2 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"193.108.117.209 orport=443 id=7600680249A22080ECC6173FBBF64D6FCF330A61"
-/* nickname=Ichotolot62 */
+"58.185.69.242 orport=8443 id=DF6F2B91C93270771C8EC92D243A7CB6234244A1"
+/* nickname=orangepeel */
 /* extrainfo=0 */
 /* ===== */
 ,
-"92.243.0.63 orport=9001 id=95F22A129FD1EE5BFF95218DDBA838BF6DBBDA7E"
-" ipv6=[2001:4b98:dc0:41:216:3eff:fed6:a283]:9001"
-/* nickname=debaze */
+"46.23.72.81 orport=443 id=7737A40305131AD8B5E60CFB9126E4BBE1ED7F76"
+/* nickname=frankovich */
 /* extrainfo=0 */
 /* ===== */
 ,
-"37.187.23.232 orport=80 id=F4873B3EC3325B81DC36C7E38AD3A5ED12B2F339"
-/* nickname=Islay */
+"134.209.224.96 orport=443 id=736CD23D364941A7C23DE00FD21E44D16B50F388"
+/* nickname=Unnamed */
 /* extrainfo=0 */
 /* ===== */
 ,
-"91.132.145.245 orport=9001 id=447A24F3402C4774D89E7AAD2D876D0BF64E3267"
-" ipv6=[2a03:4000:37:76e:68f6:30ff:fe7c:a4]:9001"
-/* nickname=m0rix */
+"103.228.53.155 orport=9001 id=01CB2E297A8F586DBBCF98F028A3D1A49B0AB7BA"
+/* nickname=Overjump */
 /* extrainfo=0 */
 /* ===== */
 ,
-"31.209.7.91 orport=9001 id=1316EE0CEBEE45E1EF4942927EC717E1AF529A68"
-/* nickname=Styx */
+"213.65.114.38 orport=65187 id=AB0D440FFAE565EFCE7D0278A3E87DAE5FA29578"
+/* nickname=Belgarath4TOR1 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"95.216.118.16 orport=4223 id=81893D8444F0C9100CCD963BD0D62BBC50121D14"
-/* nickname=geekboxNEO */
+"140.78.100.29 orport=8443 id=73F34CDC592584C0519988E443E6FDFBA72C790B"
+/* nickname=INSRelay29at8443 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"79.124.7.11 orport=443 id=B63626A3CA6F0521847853DDEC6D4044C80B903E"
-/* nickname=trumaine */
+"193.108.117.59 orport=9001 id=B00B6BA943600447CF72D58DB7A35B16754E43C8"
+/* nickname=MyTorNode */
 /* extrainfo=0 */
 /* ===== */
 ,
-"173.249.57.253 orport=433 id=467D7417FFA611BC20227FE347494CE5F61218FB"
-" ipv6=[2a02:c207:3002:8283::1]:433"
-/* nickname=DjMiddle */
+"69.164.221.78 orport=443 id=E46979A3053D43ADF187463A6E4856C875BC8C89"
+" ipv6=[2600:3c03::f03c:91ff:fe70:357]:443"
+/* nickname=teller */
 /* extrainfo=0 */
 /* ===== */
 ,
-"138.197.171.88 orport=9001 id=2E5B5397CDD7F02798F9713B2C3D85C3FEFBAFBE"
-/* nickname=Unnamed */
+"188.138.33.233 orport=443 id=D80EA21626BFAE8044E4037FE765252E157E3586"
+/* nickname=bonjour1 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"88.198.112.25 orport=9001 id=AD1FC4AE877B2FFEB3C84F1A6B76E9B057AAEF4E"
-" ipv6=[2a01:4f8:c0c:53fc::1]:9050"
-/* nickname=nicknametor */
+"85.214.147.9 orport=443 id=0FDC9A7D60608123CF5432F6E25C6E4BC23E7938"
+/* nickname=SchweinfurtsTor2 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"81.17.60.24 orport=9001 id=947FFF456CFCEF5DCAB09422E1945A8D21AEEC62"
-/* nickname=SPFCFutebol */
+"185.220.103.120 orport=443 id=9F0FEE115DF5A0E3F5A975378064D63EC21B4A19"
+/* nickname=SpeedTest8 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.233.107.110 orport=9030 id=62274AC17DCCF4030A6AD8CEBED0C36E7B8592D8"
-" ipv6=[2a03:4000:24:829::3]:9030"
-/* nickname=fiedlerRelay08 */
+"37.120.190.160 orport=9001 id=C1B513BB5E15A1887B6ADCA8C010630732FC389A"
+" ipv6=[2a03:4000:6:b39a::2]:9001"
+/* nickname=fiedlerRelay03 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"37.191.195.67 orport=38443 id=E03E581AA42A211F69DC63608B1980F10AE52C26"
-/* nickname=Unnamed */
+"213.164.204.90 orport=9001 id=22C1314867920DA37001DAD1A63F1D5CABF9DB11"
+/* nickname=Hydra30 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"193.182.144.53 orport=443 id=F001CD2A9E27B7E3ECD120951CAF968213967B31"
-/* nickname=Dragons */
+"83.53.71.25 orport=9001 id=AC7CF877B281BFEF34733E142C2A6F647AC57D82"
+/* nickname=mitorip */
 /* extrainfo=0 */
 /* ===== */
 ,
-"51.255.106.85 orport=443 id=CE8AE3563E13106A46EAD09A65AD70A5A097998F"
-/* nickname=tethys */
+"51.15.85.13 orport=3158 id=07C8367E5B7D178B899578578BFC111FB4DDF2EA"
+/* nickname=tdz */
 /* extrainfo=0 */
 /* ===== */
 ,
-"51.159.139.61 orport=443 id=5C86A09946A49E09AD64A14636DFF91746515175"
-/* nickname=tirz */
+"104.37.193.102 orport=443 id=96CAA917F65BCD62CECD236F67652BFD7C69E52E"
+/* nickname=TorRelay01 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"71.166.42.70 orport=443 id=34133CC3192CF7538089B14511400DF21BA5A077"
-/* nickname=Harambe */
+"136.49.38.118 orport=443 id=EC0ABA811E4EB33DAD8BC8B7037D862BF4F3AA28"
+/* nickname=mortimerAtx */
 /* extrainfo=0 */
 /* ===== */
 ,
-"95.216.19.207 orport=21 id=4D70F05DD308A2EA5B671E440879BFADAC92860F"
-" ipv6=[2a01:4f9:2a:1430::2]:21"
-/* nickname=arbitraryTessa1 */
+"107.189.28.100 orport=9000 id=0A76C0A0A721DDBC324B705ADBFC95FD806AE855"
+" ipv6=[2605:6400:30:f052:2387:1aef:e178:b3d7]:9000"
+/* nickname=Quetzalcoatl */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.86.150.133 orport=443 id=1684B30AE2ADD371E5D3A8B3F28ACA4CE9CA2E00"
-" ipv6=[2a02:7aa0:1619::94eb:3758]:443"
-/* nickname=Unnamed */
+"151.32.131.255 orport=443 id=2B18524260FBF9DF47CABBC22E811E76B197395E"
+/* nickname=torrone */
 /* extrainfo=0 */
 /* ===== */
 ,
-"213.239.217.68 orport=4433 id=FFBC69467B37D6AC66598BBD295F9B0D74119ADC"
-/* nickname=plan9leia */
+"114.23.164.80 orport=9001 id=CB81BCFD44FC142616BB5983648BD8AF01930789"
+/* nickname=ss23voyager */
 /* extrainfo=0 */
 /* ===== */
 ,
-"51.178.17.128 orport=9001 id=5DA4305BD06BD6F6A30BB06C34C251E256AC1328"
-/* nickname=prrlvrRelay */
+"209.141.59.180 orport=443 id=AE5B9D83AD2D7B5C10604E457ACC5E2DD9A6D81E"
+/* nickname=freedomisnotfree */
 /* extrainfo=0 */
 /* ===== */
 ,
-"212.47.236.95 orport=443 id=7C5C0E83CA290FFF6D5E30D9E0E3FFC9BAE0D0C5"
-" ipv6=[2001:bc8:47a0:201f::1]:443"
-/* nickname=Gu1nn3zzRelay */
+"45.132.246.38 orport=9001 id=431702B3A68A6015F9955DD4FD0129175B43EA0F"
+" ipv6=[2a03:4000:48:182:74dd:c1ff:fea8:d21e]:9001"
+/* nickname=bituman */
 /* extrainfo=0 */
 /* ===== */
 ,
-"114.23.164.80 orport=9001 id=CB81BCFD44FC142616BB5983648BD8AF01930789"
-/* nickname=ss23voyager */
+"109.92.182.91 orport=9001 id=28FDCC237E83C4EF83376336DB960D11D49FA756"
+/* nickname=Unnamed */
 /* extrainfo=0 */
 /* ===== */
 ,
-"179.43.156.214 orport=443 id=EDB5CB4E8609599C98F1B5C939B26B2A9BA9333B"
-/* nickname=sosa */
+"172.73.184.37 orport=443 id=11AEE567D24CDE680AC78BCD6EBAC36C50B3CF49"
+/* nickname=Mirage */
 /* extrainfo=0 */
 /* ===== */
 ,
-"142.4.215.43 orport=443 id=C1D5B04F19B45EA0F4FA65B57DFCA265D00FD80B"
-/* nickname=Unnamed */
+"95.154.25.167 orport=9001 id=AF475359500A11B48E11561CB282955DF7AA15D0"
+/* nickname=ramstor1 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"87.168.177.66 orport=9001 id=C47A245E3B12C82CB4ABBF283E66D478CCF8E240"
-/* nickname=thardes2 */
+"185.31.136.244 orport=8181 id=B2242163F681F77F93190663AC5F696ACF76C4FD"
+" ipv6=[2a00:bbe0:0:221f:9eb6:54ff:fea7:1b2d]:8181"
+/* nickname=torexit42 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"109.241.167.138 orport=9001 id=83C81FF619BE11C46F0E98B27B437154779ED6CC"
-/* nickname=MorbidHenry */
+"185.220.102.254 orport=993 id=D13692D97236C0B8E8E19EA2DD952B5C4F9010BB"
+" ipv6=[2a0b:f4c1:2::254]:993"
+/* nickname=Digitalcourage4ip7b */
 /* extrainfo=0 */
 /* ===== */
 ,
-"198.180.150.9 orport=9001 id=60E4C5E306D2DB22890EE24A09F9B6C30AF396A8"
-/* nickname=rgiad */
+"40.122.165.48 orport=443 id=32C6B88EEBD4F6F5AA61F15952E8D88EAD7C67BE"
+/* nickname=AnonUS00 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"195.154.241.145 orport=443 id=FF3D6D040641D5A33ECC8B2B57D5BC59714C4209"
-/* nickname=Unnamed */
+"176.9.1.211 orport=9001 id=D123C0F8F562804693C47D68C61786023B295E98"
+" ipv6=[2a01:4f8:141:31c2:5054:ff:fe00:ea09]:9001"
+/* nickname=bmwanon3 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"178.62.251.184 orport=9001 id=69C4C2CFCF6B418636976B5FFC0140A3BE211312"
-" ipv6=[2a03:b0c0:2:d0::95:9001]:9001"
-/* nickname=xdefTorEvey */
+"162.212.158.82 orport=9201 id=CF8CC4763298F77FF64DAF340D26D1BBF3362C5B"
+/* nickname=Assange034us2 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"101.100.146.147 orport=443 id=E300CEE2255A22B3DF52E798A3237D53AFAEC2F3"
-/* nickname=ExplorationRelay */
+"146.59.45.119 orport=443 id=CE6A9A13BB16F845C531F72923AB5D72C2C91848"
+/* nickname=morgana */
 /* extrainfo=0 */
 /* ===== */
 ,
-"172.245.21.215 orport=80 id=BA0BA7A976F153DBB050266CD3D21F499FCB975D"
-/* nickname=clanofxymox */
+"107.189.6.61 orport=9100 id=46BFF98FBD77441B28A345DFCF0F11F70EB4A4B9"
+" ipv6=[2605:6400:30:f00f:1854:a31c:7871:2582]:9100"
+/* nickname=Quetzalcoatl */
 /* extrainfo=0 */
 /* ===== */
 ,
-"163.172.169.253 orport=9001 id=04A28A62F27D9C4A60F9ED0C4264E98B988C65A3"
-" ipv6=[2001:bc8:47a4:e0a::1]:9001"
-/* nickname=darknebula */
+"45.142.100.30 orport=443 id=A013BBF2E931A7D58A3707C84761B3F6AAAB25D5"
+" ipv6=[2a10:46c0:0:2::13]:443"
+/* nickname=siffeurattex */
 /* extrainfo=0 */
 /* ===== */
 ,
-"179.43.169.20 orport=443 id=65E40F7EDD28E2CF28684E30E0BAB7706819CFC3"
-/* nickname=Fangio */
+"178.63.172.14 orport=443 id=0A178D302936F209AF3DA77CCC4E3C4D5DBE11E9"
+/* nickname=pusith */
 /* extrainfo=0 */
 /* ===== */
 ,
-"109.70.100.11 orport=443 id=96E095D5CDBFC3988DEB708EC155346472402C32"
-" ipv6=[2a03:e600:100::11]:443"
-/* nickname=karfiol */
+"37.221.65.169 orport=8443 id=39A18F31B312E5CB211781090766934C1CFDAB36"
+" ipv6=[2001:678:6d4:6010::3aed:102]:8443"
+/* nickname=Aramis66 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"140.78.100.19 orport=8443 id=885C7B6EB943068B762070E276E299319E5AB08C"
-/* nickname=INSRelay19at8443 */
+"64.44.51.37 orport=443 id=410F0781BCA296C866822A5D03A8D11F2457E78C"
+" ipv6=[2602:ffc8:1:7::bad]:443"
+/* nickname=torr1maiti */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.117.118.15 orport=9001 id=389FBE96BA489D93AF2124EB9ABE339FC4C72F1B"
-/* nickname=folo */
+"85.239.33.8 orport=9001 id=62F65E6377F0647CE0F0EE2AAE1641EC4AA2BD3B"
+/* nickname=Piplup */
 /* extrainfo=0 */
 /* ===== */
 ,
-"199.195.251.84 orport=9001 id=324E13FD795713BDD6E8B4DF02438742CA1FDBF1"
-" ipv6=[2605:6400:10:80e::1]:9001"
-/* nickname=Alina */
+"185.239.222.253 orport=443 id=7238EAB91E1050B6C6BEDDFCFD7A2440869B114A"
+" ipv6=[2a09:2681:101:9001::14]:443"
+/* nickname=BM14 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"157.131.206.89 orport=443 id=CF4DB0E0480FEB1E8F59C3D774EB9275283D579D"
-/* nickname=GreetingsFromTheNet */
+"162.247.74.213 orport=443 id=84D361B736A8CD1E8818D0FC186892E91AB76881"
+/* nickname=CalyxInstitute03 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"94.226.6.98 orport=9443 id=36EE8D47E570B8D5515460A9972F3CFD9EDFDFCE"
-/* nickname=R1610091651 */
+"51.81.160.187 orport=9001 id=F4DD04C48A6CB6DB36DF6381FFB42D5BFAD97501"
+/* nickname=FreedomRelay2 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"23.129.64.164 orport=443 id=687EFE281D08C65DE80935DEF63524EA053672B5"
-" ipv6=[2620:18c:0:192::164]:443"
-/* nickname=shelob */
+"109.70.100.16 orport=443 id=B1045E12FA4EA0D457A74013866CB41DC0D290BF"
+" ipv6=[2a03:e600:100::16]:443"
+/* nickname=broccoli */
 /* extrainfo=0 */
 /* ===== */
 ,
-"98.217.124.239 orport=9001 id=BCE86415B2EC28E449D360F632647E95D08F83C9"
-" ipv6=[2001:558:6017:16b:e5cc:c5c0:daaa:dd12]:9001"
-/* nickname=MalfunctioningEddy */
+"104.152.209.130 orport=443 id=A4A79E2B8294AA2572B46C5C772E149F84FAF763"
+/* nickname=Shebangs */
 /* extrainfo=0 */
 /* ===== */
 ,
-"178.17.174.239 orport=9001 id=53C9F4954E7A7332BB0C610C5B8E04CA065AF29B"
-" ipv6=[2a00:1dc0:caff:126::a5c9]:9001"
-/* nickname=Aramis67 */
+"213.227.133.129 orport=443 id=94318CC2299A3826D81899EB23C25A2B7D6B1FFE"
+/* nickname=byrdeman */
 /* extrainfo=0 */
 /* ===== */
 ,
-"51.15.246.170 orport=443 id=C0DAAAE5EE461BBE13945FE4B52F32ABDC6BC376"
-" ipv6=[2001:bc8:47b0:1756::1]:443"
-/* nickname=mitsuha */
+"54.36.101.21 orport=9001 id=D9C55AC5549BF4940BE0ABBBE0E34CCC8D6D06E5"
+/* nickname=ExiTOR */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.220.101.19 orport=10019 id=7E281CD2C315C4F7A84BC7C8721C3BC974DDBFA3"
-" ipv6=[2a0b:f4c2::19]:10019"
-/* nickname=relayon0130 */
+"104.244.76.13 orport=443 id=1C0D0AF3FF05CCBBA4B6ED262196A4C5A76102E6"
+/* nickname=SpongeBob */
 /* extrainfo=0 */
 /* ===== */
 ,
-"192.34.58.232 orport=9004 id=4C2C62B0828413159CBD076501C7D83BD0899893"
-/* nickname=ProEscort */
+"49.12.93.240 orport=443 id=602A20F90E20D1B9EA4DD87AE948B590C61F8A94"
+/* nickname=skewed */
 /* extrainfo=0 */
 /* ===== */
 ,
-"162.212.158.82 orport=9201 id=CF8CC4763298F77FF64DAF340D26D1BBF3362C5B"
-/* nickname=Assange034us2 */
+"37.59.37.59 orport=9001 id=B7E2EBFBE4462FC908E48007517C53ED0FF752B2"
+/* nickname=Unnamed */
 /* extrainfo=0 */
 /* ===== */
 ,
-"135.125.55.228 orport=443 id=B737FB6CBF7E514DD8D8B432A1497B9DBD0C45DA"
-/* nickname=freedomRelay */
+"140.78.100.25 orport=8443 id=9385FF13D9E3BAB934ABCBA61EE63E10346E3673"
+/* nickname=INSRelay25at8443 */
 /* extrainfo=0 */
 /* ===== */
 ,
-"185.220.100.241 orport=9000 id=62F4994C6F3A5B3E590AEECE522591696C8DDEE2"
-" ipv6=[2a0b:f4c0:16c:15::1]:9000"
-/* nickname=F3Netze */
+"185.220.103.118 orport=9000 id=3C84D97D9846044338D6DC013A6F62A9291F4614"
+/* nickname=SpeedTest5 */
 /* extrainfo=0 */
 /* ===== */
 ,
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 510ece4..151b77c 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -1060,6 +1060,10 @@ struct or_options_t {
   /** List of policy allowed to query the Metrics port. */
   struct config_line_t *MetricsPortPolicy;
 
+  /** How far must we be into the current bandwidth-measurement period to
+   * report bandwidth observations from this period? */
+  int TestingMinTimeToReportBandwidth;
+
   /**
    * Configuration objects for individual modules.
    *
diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc
index 00b3077..039454a 100644
--- a/src/app/config/testnet.inc
+++ b/src/app/config/testnet.inc
@@ -19,6 +19,7 @@
 { "TestingV3AuthInitialDistDelay", "20 seconds" },
 { "TestingAuthDirTimeToLearnReachability", "0 minutes" },
 { "MinUptimeHidServDirectoryV2", "0 minutes" },
+{ "TestingMinTimeToReportBandwidth", "0 seconds" },
 { "TestingServerDownloadInitialDelay", "0" },
 { "TestingClientDownloadInitialDelay", "0" },
 { "TestingServerConsensusDownloadInitialDelay", "0" },
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
index 6f6f22a..d3979b3 100644
--- a/src/core/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@ -2530,10 +2530,15 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
 
     /* We don't support v2 onions anymore. Log a warning and bail. */
     if (addresstype == ONION_V2_HOSTNAME) {
-      log_warn(LD_PROTOCOL, "Tried to connect to a v2 onion address, but this "
-               "version of Tor no longer supports them. Please encourage the "
-               "site operator to upgrade. For more information see "
-               "https://blog.torproject.org/v2-deprecation-timeline.");
+      static bool log_once = false;
+      if (!log_once) {
+        log_warn(LD_PROTOCOL, "Tried to connect to a v2 onion address, but "
+                 "this version of Tor no longer supports them. Please "
+                 "encourage the site operator to upgrade. For more "
+                 "information see "
+                 "https://blog.torproject.org/v2-deprecation-timeline.");
+        log_once = true;
+      }
       control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
                                   escaped(socks->address));
       /* Send back the 0xF6 extended code indicating a bad hostname. This is
diff --git a/src/feature/dirclient/dirclient.c b/src/feature/dirclient/dirclient.c
index fd677d3..0b6a810 100644
--- a/src/feature/dirclient/dirclient.c
+++ b/src/feature/dirclient/dirclient.c
@@ -709,7 +709,22 @@ connection_dir_client_request_failed(dir_connection_t *conn)
     entry_guard_failed(&conn->guard_state);
   }
   if (!entry_list_is_constrained(get_options()))
-    router_set_status(conn->identity_digest, 0); /* don't try this one again */
+    /* We must not set a directory to non-running for HS purposes else we end
+     * up flagging nodes from the hashring has unusable. It doesn't have direct
+     * effect on the HS subsystem because the nodes are selected regardless of
+     * their status but still, we shouldn't flag them as non running.
+     *
+     * One example where this can go bad is if a tor instance gets added a lot
+     * of ephemeral services and with a network with problem then many nodes in
+     * the consenus ends up unusable.
+     *
+     * Furthermore, a service does close any pending directory connections
+     * before uploading a descriptor and thus we can end up here in a natural
+     * way since closing a pending directory connection leads to this code
+     * path. */
+    if (!DIR_PURPOSE_IS_HS(TO_CONN(conn)->purpose)) {
+      router_set_status(conn->identity_digest, 0);
+    }
   if (conn->base_.purpose == DIR_PURPOSE_FETCH_SERVERDESC ||
              conn->base_.purpose == DIR_PURPOSE_FETCH_EXTRAINFO) {
     log_info(LD_DIR, "Giving up on serverdesc/extrainfo fetch from "
diff --git a/src/feature/dircommon/directory.h b/src/feature/dircommon/directory.h
index f233e8b..7d86168 100644
--- a/src/feature/dircommon/directory.h
+++ b/src/feature/dircommon/directory.h
@@ -80,6 +80,12 @@ const dir_connection_t *CONST_TO_DIR_CONN(const connection_t *c);
    (p)==DIR_PURPOSE_UPLOAD_SIGNATURES ||        \
    (p)==DIR_PURPOSE_UPLOAD_HSDESC)
 
+/** True iff p is a purpose corresponding to onion service that is either
+ * uploading or fetching actions. */
+#define DIR_PURPOSE_IS_HS(p)          \
+  ((p) == DIR_PURPOSE_FETCH_HSDESC || \
+   (p) == DIR_PURPOSE_UPLOAD_HSDESC)
+
 enum compress_method_t;
 int parse_http_response(const char *headers, int *code, time_t *date,
                         enum compress_method_t *compression, char **response);
diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c
index 68ed932..73f9176 100644
--- a/src/feature/hs/hs_config.c
+++ b/src/feature/hs/hs_config.c
@@ -159,8 +159,12 @@ static bool
 check_value_oob(int i, const char *name, int low, int high)
 {
   if (i < low || i > high) {
-    log_warn(LD_CONFIG, "%s must be between %d and %d, not %d.",
-             name, low, high, i);
+    if (low == high) {
+      log_warn(LD_CONFIG, "%s must be %d, not %d.", name, low, i);
+    } else {
+      log_warn(LD_CONFIG, "%s must be between %d and %d, not %d.",
+               name, low, high, i);
+    }
     return true;
   }
   return false;
diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c
index 2ffa6da..af808a6 100644
--- a/src/feature/nodelist/networkstatus.c
+++ b/src/feature/nodelist/networkstatus.c
@@ -103,6 +103,7 @@
 #include "feature/dirauth/vote_microdesc_hash_st.h"
 #include "feature/nodelist/vote_routerstatus_st.h"
 #include "feature/nodelist/routerstatus_st.h"
+#include "feature/stats/rephist.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -1663,6 +1664,7 @@ notify_before_networkstatus_changes(const networkstatus_t *old_c,
   dos_consensus_has_changed(new_c);
   relay_consensus_has_changed(new_c);
   hs_dos_consensus_has_changed(new_c);
+  rep_hist_consensus_has_changed(new_c);
 }
 
 /* Called after a new consensus has been put in the global state. It is safe
diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c
index 22f9298..6a703f2 100644
--- a/src/feature/relay/dns.c
+++ b/src/feature/relay/dns.c
@@ -212,20 +212,11 @@ evdns_log_cb(int warn, const char *msg)
   tor_log(severity, LD_EXIT, "eventdns: %s", msg);
 }
 
-/** Helper: passed to eventdns.c as a callback so it can generate random
- * numbers for transaction IDs and 0x20-hack coding. */
-static void
-dns_randfn_(char *b, size_t n)
-{
-  crypto_rand(b,n);
-}
-
 /** Initialize the DNS subsystem; called by the OR process. */
 int
 dns_init(void)
 {
   init_cache_map();
-  evdns_set_random_bytes_fn(dns_randfn_);
   if (server_mode(get_options())) {
     int r = configure_nameservers(1);
     return r;
@@ -1548,16 +1539,6 @@ evdns_callback(int result, char type, int count, int ttl, void *addresses,
 
   tor_addr_make_unspec(&addr);
 
-  /* Note down any DNS errors to the statistics module */
-  if (result == DNS_ERR_TIMEOUT) {
-    /* libevent timed out while resolving a name. However, because libevent
-     * handles retries and timeouts internally, this means that all attempts of
-     * libevent timed out. If we wanted to get more granular information about
-     * individual libevent attempts, we would have to implement our own DNS
-     * timeout/retry logic */
-    rep_hist_note_overload(OVERLOAD_GENERAL);
-  }
-
   /* Keep track of whether IPv6 is working */
   if (type == DNS_IPv6_AAAA) {
     if (result == DNS_ERR_TIMEOUT) {
@@ -1659,6 +1640,10 @@ evdns_callback(int result, char type, int count, int ttl, void *addresses,
     dns_found_answer(string_address, orig_query_type,
                      result, &addr, hostname, ttl);
 
+  /* The result can be changed within this function thus why we note the result
+   * at the end. */
+  rep_hist_note_dns_query(type, result);
+
   tor_free(arg_);
 }
 
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index 67d3e3e..a2ca472 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -2622,7 +2622,10 @@ check_descriptor_bandwidth_changed(time_t now)
   if ((prev != cur && (!prev || !cur)) ||
       cur > (prev * BANDWIDTH_CHANGE_FACTOR) ||
       cur < (prev / BANDWIDTH_CHANGE_FACTOR) ) {
-    if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now || !prev) {
+    const bool change_recent_enough =
+      last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now;
+    const bool testing_network = get_options()->TestingTorNetwork;
+    if (change_recent_enough || testing_network || !prev) {
       log_info(LD_GENERAL,
                "Measured bandwidth has changed; rebuilding descriptor.");
       mark_my_descriptor_dirty("bandwidth has changed");
diff --git a/src/feature/stats/bwhist.c b/src/feature/stats/bwhist.c
index d5a9b73..552dc7a 100644
--- a/src/feature/stats/bwhist.c
+++ b/src/feature/stats/bwhist.c
@@ -206,16 +206,24 @@ bwhist_note_dir_bytes_read(uint64_t num_bytes, time_t when)
   add_obs(dir_read_array, when, num_bytes);
 }
 
-/** Helper: Return the largest value in b->maxima.  (This is equal to the
+/**
+ * Helper: Return the largest value in b->maxima.  (This is equal to the
  * most bandwidth used in any NUM_SECS_ROLLING_MEASURE period for the last
  * NUM_SECS_BW_SUM_IS_VALID seconds.)
+ *
+ * Also include the current period if we have been observing it for
+ * at least min_observation_time seconds.
  */
 STATIC uint64_t
-find_largest_max(bw_array_t *b)
+find_largest_max(bw_array_t *b, int min_observation_time)
 {
   int i;
   uint64_t max;
-  max=0;
+  time_t period_start = b->next_period - NUM_SECS_BW_SUM_INTERVAL;
+  if (b->cur_obs_time > period_start + min_observation_time)
+    max = b->max_total;
+  else
+    max = 0;
   for (i=0; i<NUM_TOTALS; ++i) {
     if (b->maxima[i]>max)
       max = b->maxima[i];
@@ -233,8 +241,9 @@ MOCK_IMPL(int,
 bwhist_bandwidth_assess,(void))
 {
   uint64_t w,r;
-  r = find_largest_max(read_array);
-  w = find_largest_max(write_array);
+  int min_obs_time = get_options()->TestingMinTimeToReportBandwidth;
+  r = find_largest_max(read_array, min_obs_time);
+  w = find_largest_max(write_array, min_obs_time);
   if (r>w)
     return (int)(((double)w)/NUM_SECS_ROLLING_MEASURE);
   else
diff --git a/src/feature/stats/bwhist.h b/src/feature/stats/bwhist.h
index e7fc60f..d61c442 100644
--- a/src/feature/stats/bwhist.h
+++ b/src/feature/stats/bwhist.h
@@ -28,7 +28,7 @@ int bwhist_load_state(struct or_state_t *state, char **err);
 
 #ifdef BWHIST_PRIVATE
 typedef struct bw_array_t bw_array_t;
-STATIC uint64_t find_largest_max(bw_array_t *b);
+STATIC uint64_t find_largest_max(bw_array_t *b, int min_observation_time);
 STATIC void commit_max(bw_array_t *b);
 STATIC void advance_obs(bw_array_t *b);
 STATIC bw_array_t *bw_array_new(void);
diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c
index e25c013..c3a281a 100644
--- a/src/feature/stats/rephist.c
+++ b/src/feature/stats/rephist.c
@@ -84,6 +84,8 @@
 #include "feature/nodelist/networkstatus_st.h"
 #include "core/or/or_circuit_st.h"
 
+#include <event2/dns.h>
+
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
@@ -204,6 +206,54 @@ typedef struct {
   uint64_t overload_fd_exhausted;
 } overload_stats_t;
 
+/***** DNS statistics *****/
+
+/** Represents the statistics of DNS queries seen if it is an Exit. */
+typedef struct {
+  /** Total number of DNS request seen at an Exit. They might not all end
+   * successfully or might even be lost by tor. This counter is incremented
+   * right before the DNS request is initiated. */
+  uint64_t stats_n_request;
+
+  /** Total number of DNS timeout errors. */
+  uint64_t stats_n_error_timeout;
+
+  /** When is the next assessment time of the general overload for DNS errors.
+   * Once this time is reached, all stats are reset and this time is set to the
+   * next assessment time. */
+  time_t next_assessment_time;
+} overload_dns_stats_t;
+
+/** Keep track of the DNS requests for the general overload state. */
+static overload_dns_stats_t overload_dns_stats;
+
+/* We use a scale here so we can represent percentages with decimal points by
+ * scaling the value by this factor and so 0.5% becomes a value of 500.
+ * Default is 1% and thus min and max range is 0 to 100%. */
+#define OVERLOAD_DNS_TIMEOUT_PERCENT_SCALE 1000.0
+#define OVERLOAD_DNS_TIMEOUT_PERCENT_DEFAULT 1000
+#define OVERLOAD_DNS_TIMEOUT_PERCENT_MIN 0
+#define OVERLOAD_DNS_TIMEOUT_PERCENT_MAX 100000
+
+/** Consensus parameter: indicate what fraction of DNS timeout errors over the
+ * total number of DNS requests must be reached before we trigger a general
+ * overload signal .*/
+static double overload_dns_timeout_fraction =
+   OVERLOAD_DNS_TIMEOUT_PERCENT_DEFAULT /
+   OVERLOAD_DNS_TIMEOUT_PERCENT_SCALE / 100.0;
+
+/* Number of seconds for the assessment period. Default is 10 minutes (600) and
+ * the min max range is within a 32bit value. */
+#define OVERLOAD_DNS_TIMEOUT_PERIOD_SECS_DEFAULT (10 * 60)
+#define OVERLOAD_DNS_TIMEOUT_PERIOD_SECS_MIN 0
+#define OVERLOAD_DNS_TIMEOUT_PERIOD_SECS_MAX INT32_MAX
+
+/** Consensus parameter: Period, in seconds, over which we count the number of
+ * DNS requests and timeout errors. After that period, we assess if we trigger
+ * an overload or not. */
+static int32_t overload_dns_timeout_period_secs =
+  OVERLOAD_DNS_TIMEOUT_PERIOD_SECS_DEFAULT;
+
 /** Current state of overload stats */
 static overload_stats_t overload_stats;
 
@@ -218,6 +268,89 @@ overload_happened_recently(time_t overload_time, int n_hours)
   return false;
 }
 
+/** Assess the DNS timeout errors and if we have enough to trigger a general
+ * overload. */
+static void
+overload_general_dns_assessment(void)
+{
+  /* Initialize the time. Should be done once. */
+  if (overload_dns_stats.next_assessment_time == 0) {
+    goto reset;
+  }
+
+  /* Not the time yet. */
+  if (overload_dns_stats.next_assessment_time > approx_time()) {
+    return;
+  }
+
+  /* Lets see if we can signal a general overload. */
+  double fraction = (double) overload_dns_stats.stats_n_error_timeout /
+                    (double) overload_dns_stats.stats_n_request;
+  if (fraction >= overload_dns_timeout_fraction) {
+    log_notice(LD_HIST, "General overload -> DNS timeouts (%" PRIu64 ") "
+               "fraction %.4f%% is above threshold of %.4f%%",
+               overload_dns_stats.stats_n_error_timeout,
+               fraction * 100.0,
+               overload_dns_timeout_fraction * 100.0);
+    rep_hist_note_overload(OVERLOAD_GENERAL);
+  }
+
+ reset:
+  /* Reset counters for the next period. */
+  overload_dns_stats.stats_n_error_timeout = 0;
+  overload_dns_stats.stats_n_request = 0;
+  overload_dns_stats.next_assessment_time =
+    approx_time() + overload_dns_timeout_period_secs;
+}
+
+/** Called just before the consensus will be replaced. Update the consensus
+ * parameters in case they changed. */
+void
+rep_hist_consensus_has_changed(const networkstatus_t *ns)
+{
+  overload_dns_timeout_fraction =
+    networkstatus_get_param(ns, "overload_dns_timeout_scale_percent",
+                            OVERLOAD_DNS_TIMEOUT_PERCENT_DEFAULT,
+                            OVERLOAD_DNS_TIMEOUT_PERCENT_MIN,
+                            OVERLOAD_DNS_TIMEOUT_PERCENT_MAX) /
+    OVERLOAD_DNS_TIMEOUT_PERCENT_SCALE / 100.0;
+
+  overload_dns_timeout_period_secs =
+    networkstatus_get_param(ns, "overload_dns_timeout_period_secs",
+                            OVERLOAD_DNS_TIMEOUT_PERIOD_SECS_DEFAULT,
+                            OVERLOAD_DNS_TIMEOUT_PERIOD_SECS_MIN,
+                            OVERLOAD_DNS_TIMEOUT_PERIOD_SECS_MAX);
+}
+
+/** Note a DNS error for the given given libevent DNS record type and error
+ * code. Possible types are: DNS_IPv4_A, DNS_PTR, DNS_IPv6_AAAA.
+ *
+ * IMPORTANT: Libevent is _not_ returning the type in case of an error and so
+ * if error is anything but DNS_ERR_NONE, the type is not usable and set to 0.
+ *
+ * See: https://gitlab.torproject.org/tpo/core/tor/-/issues/40490 */
+void
+rep_hist_note_dns_query(int type, uint8_t error)
+{
+  (void) type;
+
+  /* Assess if we need to trigger a general overload with regards to the DNS
+   * errors or not. */
+  overload_general_dns_assessment();
+
+  /* We only care about timeouts for the moment. */
+  switch (error) {
+  case DNS_ERR_TIMEOUT:
+    overload_dns_stats.stats_n_error_timeout++;
+    break;
+  default:
+    break;
+  }
+
+  /* Increment total number of requests. */
+  overload_dns_stats.stats_n_request++;
+}
+
 /* The current version of the overload stats version */
 #define OVERLOAD_STATS_VERSION 1
 
diff --git a/src/feature/stats/rephist.h b/src/feature/stats/rephist.h
index d4a2f30..749b499 100644
--- a/src/feature/stats/rephist.h
+++ b/src/feature/stats/rephist.h
@@ -72,11 +72,14 @@ void rep_hist_seen_new_rp_cell(bool is_v2);
 char *rep_hist_get_hs_v3_stats_string(void);
 void rep_hist_hsdir_stored_maybe_new_v3_onion(const uint8_t *blinded_key);
 
+void rep_hist_note_dns_query(int type, uint8_t error);
+
 void rep_hist_free_all(void);
 
 void rep_hist_note_negotiated_link_proto(unsigned link_proto,
                                          int started_here);
 void rep_hist_log_link_protocol_counts(void);
+void rep_hist_consensus_has_changed(const networkstatus_t *ns);
 
 extern uint64_t rephist_total_alloc;
 extern uint32_t rephist_total_num;
diff --git a/src/test/test_hs_config.c b/src/test/test_hs_config.c
index 54a0b23..74f823f 100644
--- a/src/test/test_hs_config.c
+++ b/src/test/test_hs_config.c
@@ -48,7 +48,7 @@ test_invalid_service(void *arg)
     setup_full_capture_of_logs(LOG_WARN);
     ret = helper_config_service(conf, 1);
     tt_int_op(ret, OP_EQ, -1);
-    expect_log_msg_containing("HiddenServiceVersion must be between 3 and 3");
+    expect_log_msg_containing("HiddenServiceVersion must be 3, not 1");
     teardown_capture_of_logs();
   }
 
diff --git a/src/test/test_relay.c b/src/test/test_relay.c
index 7338340..dbedc02 100644
--- a/src/test/test_relay.c
+++ b/src/test/test_relay.c
@@ -98,7 +98,7 @@ test_relay_close_circuit(void *arg)
   tt_int_op(new_count, OP_EQ, old_count + 1);
 
   /* Ensure our write totals are 0 */
-  tt_u64_op(find_largest_max(write_array), OP_EQ, 0);
+  tt_u64_op(find_largest_max(write_array, 86400), OP_EQ, 0);
 
   /* Mark the circuit for close */
   circuit_mark_for_close(TO_CIRCUIT(orcirc), 0);
@@ -107,7 +107,7 @@ test_relay_close_circuit(void *arg)
   advance_obs(write_array);
   commit_max(write_array);
   /* Check for two cells plus overhead */
-  tt_u64_op(find_largest_max(write_array), OP_EQ,
+  tt_u64_op(find_largest_max(write_array, 86400), OP_EQ,
                              2*(get_cell_network_size(nchan->wide_circ_ids)
                                 +TLS_PER_CELL_OVERHEAD));
 
diff --git a/src/test/test_stats.c b/src/test/test_stats.c
index 081ae22..3b9a192 100644
--- a/src/test/test_stats.c
+++ b/src/test/test_stats.c
@@ -51,6 +51,8 @@
 #include "feature/stats/bw_array_st.h"
 #include "feature/relay/router.h"
 
+#include "event2/dns.h"
+
 /** Run unit tests for some stats code. */
 static void
 test_stats(void *arg)
@@ -865,6 +867,81 @@ test_overload_stats(void *arg)
   tor_free(stats_str);
 }
 
+/** Test the overload stats logic. */
+static void
+test_overload_dns_timeout(void *arg)
+{
+  char *stats_str = NULL;
+  (void) arg;
+
+  /* Lets simulate a series of timeouts but below our default 1% threshold. */
+
+  for (int i = 0; i < 1000; i++) {
+    /* This should trigger 9 timeouts which is just below 1% (10) */
+    if (i > 0 && !(i % 100)) {
+      rep_hist_note_dns_query(0, DNS_ERR_TIMEOUT);
+    } else {
+      rep_hist_note_dns_query(0, DNS_ERR_NONE);
+    }
+  }
+
+  /* No overload yet. */
+  stats_str = rep_hist_get_overload_general_line();
+  tt_assert(!stats_str);
+
+  /* Move it 10 minutes in the future and see if we get a general overload. */
+  update_approx_time(approx_time() + (10 * 60));
+
+  /* This query should NOT trigger the general overload because we are below
+   * our default of 1%. */
+  rep_hist_note_dns_query(0, DNS_ERR_NONE);
+  stats_str = rep_hist_get_overload_general_line();
+  tt_assert(!stats_str);
+
+  /* We'll now go above our 1% threshold. */
+  for (int i = 0; i < 1000; i++) {
+    /* This should trigger 10 timeouts which is our threshold of 1% (10) */
+    if (!(i % 10)) {
+      rep_hist_note_dns_query(0, DNS_ERR_TIMEOUT);
+    } else {
+      rep_hist_note_dns_query(0, DNS_ERR_NONE);
+    }
+  }
+
+  /* Move it 10 minutes in the future and see if we get a general overload. */
+  update_approx_time(approx_time() + (10 * 60));
+
+  /* This query should trigger the general overload because we are above 1%. */
+  rep_hist_note_dns_query(0, DNS_ERR_NONE);
+  stats_str = rep_hist_get_overload_general_line();
+  tt_assert(stats_str);
+  tor_free(stats_str);
+
+  /* Move 72h in the future, we should NOT get an overload anymore. */
+  update_approx_time(approx_time() + (72 * 3600));
+
+  stats_str = rep_hist_get_overload_general_line();
+  tt_assert(!stats_str);
+
+  /* This query should NOT trigger the general overload. */
+  rep_hist_note_dns_query(0, DNS_ERR_TIMEOUT);
+  stats_str = rep_hist_get_overload_general_line();
+  tt_assert(!stats_str);
+
+  /* Move it 10 minutes in the future and see if we get a general overload. We
+   * have now 100% of requests timing out. */
+  update_approx_time(approx_time() + (10 * 60));
+
+  /* This query should trigger the general overload with 50% of timeouts. */
+  rep_hist_note_dns_query(0, DNS_ERR_NONE);
+  stats_str = rep_hist_get_overload_general_line();
+  tt_assert(stats_str);
+  tor_free(stats_str);
+
+ done:
+  tor_free(stats_str);
+}
+
 #define ENT(name)                                                       \
   { #name, test_ ## name , 0, NULL, NULL }
 #define FORK(name)                                                      \
@@ -881,6 +958,7 @@ struct testcase_t stats_tests[] = {
   FORK(rephist_v3_onions),
   FORK(load_stats_file),
   FORK(overload_stats),
+  FORK(overload_dns_timeout),
 
   END_OF_TESTCASES
 };
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index cc70a3a..ac4a8e3 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.6.7"
+#define VERSION "0.4.6.8"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR
diff --git a/test-driver b/test-driver
index 89dba1e..9759384 100755
--- a/test-driver
+++ b/test-driver
@@ -42,11 +42,13 @@ print_usage ()
 {
   cat <<END
 Usage:
-  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
-              [--expect-failure={yes|no}] [--color-tests={yes|no}]
-              [--enable-hard-errors={yes|no}] [--]
+  test-driver --test-name NAME --log-file PATH --trs-file PATH
+              [--expect-failure {yes|no}] [--color-tests {yes|no}]
+              [--enable-hard-errors {yes|no}] [--]
               TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+
 The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+See the GNU Automake documentation for information.
 END
 }