Merge branch 'maint-0.4.0'

changes/ticket28614

@@ -3,6 +3,6 @@
       "binary" mode so that we can safely map it into memory later.
       Fixes part of bug 28614; bugfix on 0.4.0.1-alpha.
     - When reading a consensus file from disk, detect whether it
-      was written in text mode, and re-read it in text mode if it
+      was written in text mode, and re-read it in text mode if so.
       Fixes part of bug 28614; bugfix on 0.4.0.1-alpha.
 

changes/ticket29072

@@ -0,0 +1,2 @@
+  o Removed features:
+    - Remove check-tor script from repository. Resolves issue 29072.

contrib/or-tools/check-tor

@@ -1,41 +0,0 @@
-#!/bin/sh
-
-## Originally written by Peter Palfrader.
-
-## This script lets you quickly check if a given router (by nickname)
-## will let you do a TLS handshake, or will let you download a directory.
-
-## Usage: check-tor nickname
-
-#set -x
-
-router="$1"
-dirserver="http://belegost.seul.org:80/tor/"
-
-lines=$( wget -q $dirserver --proxy=off -O - | grep -A5 '^router '"$router"' ' )
-line=$( echo "$lines" | head -n1 )
-
-if [ -z "$line" ]; then
-	echo "Not found" >&2
-	exit 1
-fi
-
-echo "$lines"
-echo
-
-ipor=$( echo "$line" | awk '{printf "%s:%s", $3, $4}' )
-
-op=$( echo "$line" | awk '{printf $6}' )
-ipop=$( echo "$line" | awk '{printf "%s:%s", $3, $6}' )
-
-echo
-echo ">>" openssl s_client -connect "$ipor"
-timeout 5 openssl s_client -connect "$ipor" < /dev/null
-if [ "$op" != "0" ]; then
-	echo
-	echo ">>" wget --proxy=off -O - http://$ipop/tor/
-	timeout 5 wget --proxy=off -O - http://$ipop/tor/ | head -n3
-fi
-
-echo
-echo -n "$router "; echo "$lines" | grep 'fingerprint' | sed -e 's/^opt //' -e 's/^fingerprint //';

src/feature/nodelist/networkstatus.c

@@ -1743,7 +1743,7 @@ networkstatus_set_current_consensus_from_ns(networkstatus_t *c,
 #endif /* defined(TOR_UNIT_TESTS) */
 
 /**
- * Helper: Read a the current consensus of type <b>flavor</b> from
+ * Helper: Read the current consensus of type <b>flavor</b> from
  * <b>fname</b>.  Flags and return values are as for
  * networkstatus_set_current_consensus().
  **/

src/test/test_util.c

@@ -6360,6 +6360,6 @@ struct testcase_t util_tests[] = {
   UTIL_TEST(get_unquoted_path, 0),
   UTIL_TEST(log_mallinfo, 0),
   UTIL_TEST(map_anon, 0),
-  UTIL_TEST(map_anon_nofork, 0),
+  UTIL_TEST(map_anon_nofork, TT_SKIP /* See bug #29535 */),
   END_OF_TESTCASES
 };