Merge branch 'maint-0.4.2' into bug40076_042

changes/bug27800

-  o Minor bugfixes (directory authority):
-    - Log additional info when we get a relay that shares an ed25519
-      ID with a different relay, instead making a BUG() warning.
-      Fixes bug 27800; bugfix on 0.3.2.1-alpha.

changes/bug27804

-  o Minor bugfixes (rust):
-    - Fix a potential null dereference in protover_all_supported().
-      Add a test for it. Fixes bug 27804; bugfix on 0.3.3.1-alpha.

changes/bug27841

-  o Minor bugfixes (onion services):
-    - On an intro point for a version 3 onion service, we do not close
-      an introduction circuit on an NACK. This lets the client decide
-      whether to reuse the circuit or discard it. Previously, we closed
-      intro circuits on NACKs. Fixes bug 27841; bugfix on 0.3.2.1-alpha.
-      Patch by Neel Chaunan
-

changes/bug27948

-  o Minor bugfixes (tests):
-    - Treat backtrace test failures as expected on BSD-derived systems
-      (NetBSD, OpenBSD, and macOS/Darwin) until we solve bug 17808.
-      (FreeBSD failures have been treated as expected since 18204 in 0.2.8.)
-      Fixes bug 27948; bugfix on 0.2.5.2-alpha.
-

changes/bug27963_timeradd

-  o Minor bugfixes (compilation, opensolaris):
-    - Add a missing include to compat_pthreads.c, to fix compilation
-      on OpenSolaris and its descendants. Fixes bug 27963; bugfix
-      on 0.3.5.1-alpha.

changes/bug27968

-  o Minor bugfixes (testing):
-    - Avoid hangs and race conditions in test_rebind.py.
-      Fixes bug 27968; bugfix on 0.3.5.1-alpha.

changes/bug28096

-  o Minor bugfixes (Windows):
-    - Correctly identify Windows 8.1, Windows 10, and Windows Server 2008
-      and later from their NT versions.
-      Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly.
-    - On recent Windows versions, the GetVersionEx() function may report
-      an earlier Windows version than the running OS. To avoid user
-      confusion, add "[or later]" to Tor's version string on affected
-      versions of Windows.
-      Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly.
-    - Remove Windows versions that were never supported by the
-      GetVersionEx() function. Stop duplicating the latest Windows
-      version in get_uname().
-      Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly.

changes/bug28115

-  o Minor bugfixes (portability):
-    - Make the OPE code (which is used for v3 onion services) run correctly
-      on big-endian platforms. Fixes bug 28115; bugfix on 0.3.5.1-alpha.

changes/bug28127

-  o Minor bugfixes (onion services):
-    - Unless we have explicitly set HiddenServiceVersion, detect the onion
-      service version and then look for invalid options. Previously, we
-      did the reverse, but that broke existing configs which were pointed
-      to a v2 hidden service and had options like HiddenServiceAuthorizeClient
-      set Fixes bug 28127; bugfix on 0.3.5.1-alpha. Patch by Neel Chauhan.
-

changes/bug28183

-  o Minor bugfixes (Linux seccomp2 sandbox):
-    - Permit the "shutdown()" system call, which is apparently
-      used by OpenSSL under some circumstances. Fixes bug 28183;
-      bugfix on 0.2.5.1-alpha.

changes/bug28202

-  o Minor bugfixes (C correctness):
-    - Avoid undefined behavior in an end-of-string check when parsing the
-      BEGIN line in a directory object.  Fixes bug 28202; bugfix on
-      0.2.0.3-alpha.

changes/bug28245

-  o Major bugfixes (OpenSSL, portability):
-    - Fix our usage of named groups when running as a TLS 1.3 client in
-      OpenSSL 1.1.1. Previously, we only initialized EC groups when running
-      as a server, which caused clients to fail to negotiate TLS 1.3 with
-      relays. Fixes bug 28245; bugfix on 0.2.9.15 when TLS 1.3 support was
-      added.

changes/bug28298

-  o Minor bugfixes (configuration):
-    - Resume refusing to start with relative file paths and RunAsDaemon
-      set (regression from the fix for bug 22731). Fixes bug 28298;
-      bugfix on 0.3.3.1-alpha.

changes/bug28303

-  o Minor bugfixes (compilation):
-    - Fix a pair of missing headers on OpenBSD. Fixes bug 28303;
-      bugfix on 0.3.5.1-alpha. Patch from  Kris Katterjohn.

changes/bug28348_034

-  o Major bugfixes (embedding, main loop):
-    - When DisableNetwork becomes set, actually disable periodic events that
-      are already enabled. (Previously, we would refrain from enabling new
-      ones, but we would leave the old ones turned on.)
-      Fixes bug 28348; bugfix on 0.3.4.1-alpha.

changes/bug28399

-  o Minor bugfixes (continuous integration, Windows):
-    - Stop using an external OpenSSL install, and stop installing MSYS2
-      packages, when building using mingw on Appveyor Windows CI.
-      Fixes bug 28399; bugfix on 0.3.4.1-alpha.

changes/bug28413

-  o Minor bugfixes (compilation):
-    - Initialize a variable in aes_new_cipher(), since some compilers
-      cannot tell that we always initialize it before use. Fixes bug 28413;
-      bugfix on 0.2.9.3-alpha.

changes/bug28419

-  o Minor bugfixes (memory leaks):
-    - Fix a harmless memory leak in libtorrunner.a. Fixes bug 28419;
-      bugfix on 0.3.3.1-alpha.  Patch from Martin Kepplinger.
\ No newline at end of file

changes/bug28435

-  o Minor bugfixes (documentation):
-    - Make Doxygen work again after the 0.3.5 source tree moves.
-      Fixes bug 28435; bugfix on 0.3.5.1-alpha.

changes/bug28441

-  o Minor bugfixes (logging):
-    - Stop talking about the Named flag in log messages. Clients have
-      ignored the Named flag since 0.3.2. Fixes bug 28441;
-      bugfix on 0.3.2.1-alpha.