Merge commit '551af4f97d37c7b4cff7a8557c1a1a647487b4cb'

changes/bug17173-socket-hack-rv

@@ -1,10 +1,3 @@
   o Minor bug fixes (addresses, testing):
-    - Handle errors in get_interface_address6_via_udp_socket_hack by
-      returning an empty list (no addresses found). This bug was triggered
-      in ElectroBSD/FreeBSD jails.
-    - Ensure that either a valid address is returned in address pointers,
-      or that the address data is zeroed on error.
-    - Ensure that free_interface_address6_list handles NULL lists.
     - Add unit tests for get_interface_address* failure cases.
-      Fixes bug #17173.
-      Patch by fk/teor, not in any released version of tor.
+      Fixes bug 17173; bugfix on 0.2.7.3-rc.  Patch by fk/teor.

changes/bug17237_027

@@ -1,4 +1,3 @@
   o Minor features (compilation):
     - Repair compilation with the most recent (unreleased, alpha)
-      vesions of OpenSSL 1.1. Fixes the 0.2.7-related part of
-      ticket 17237.
+      vesions of OpenSSL 1.1. Fixes part of ticket 17237.

changes/ifaddrs-tests-network-configs

@@ -1,7 +1,5 @@
-  o Minor fixes (unit tests, networking):
-    - Make get_ifaddrs_* unit tests more tolerant of different network
-      configurations:
-        - Don't assume every test box has an IPv4 address.
-        - Don't assume every test box has a non-localhost address.
-    - Closes ticket #17255. Patch by "teor".
-      Fix for unit tests released in 0.2.7.3.
+  o Minor bugfixes (testing):
+    - Make the get_ifaddrs_* unit tests more tolerant of different network
+      configurations. (Don't assume every test box has an IPv4 address, and
+      Don't assume every test box has a non-localhost address.
+      Fixes bug 17255; bugfix on 0.2.7.3-rc.  Patch by "teor".