Skip to content
Permalink
Browse files

tor: updated to 0.3.5.9

  • Loading branch information
RMerl committed Feb 10, 2020
1 parent c4bc78e commit a7357b4b4319ea312ef90b3c9c8e16af6d161fdd
Showing with 58,614 additions and 30,982 deletions.
  1. +473 −0 release/src/router/tor/ChangeLog
  2. +4 −2 release/src/router/tor/Makefile.am
  3. +4 −2 release/src/router/tor/Makefile.in
  4. +473 −0 release/src/router/tor/ReleaseNotes
  5. +65 −55 release/src/router/tor/config.guess
  6. +1,192 −1,235 release/src/router/tor/config.sub
  7. +10 −10 release/src/router/tor/configure
  8. +1 −1 release/src/router/tor/configure.ac
  9. +172 −5 release/src/router/tor/contrib/operator-tools/tor-exit-notice.html
  10. +1 −1 release/src/router/tor/contrib/win32build/tor-mingw.nsi.in
  11. +2 −2 release/src/router/tor/doc/tor-gencert.1.in
  12. +1 −1 release/src/router/tor/doc/tor-gencert.html.in
  13. +2 −2 release/src/router/tor/doc/tor-print-ed-signing-cert.1.in
  14. +1 −1 release/src/router/tor/doc/tor-print-ed-signing-cert.html.in
  15. +2 −2 release/src/router/tor/doc/tor-resolve.1.in
  16. +1 −1 release/src/router/tor/doc/tor-resolve.html.in
  17. +11 −6 release/src/router/tor/doc/tor.1.in
  18. +12 −7 release/src/router/tor/doc/tor.1.txt
  19. +18 −8 release/src/router/tor/doc/tor.html.in
  20. +2 −2 release/src/router/tor/doc/torify.1.in
  21. +1 −1 release/src/router/tor/doc/torify.html.in
  22. +1 −1 release/src/router/tor/src/app/config/auth_dirs.inc
  23. +20 −6 release/src/router/tor/src/app/config/config.c
  24. +1 −0 release/src/router/tor/src/app/config/confparse.c
  25. +261 −306 release/src/router/tor/src/app/config/fallback_dirs.inc
  26. +1 −0 release/src/router/tor/src/app/main/main.c
  27. +41,835 −24,822 release/src/router/tor/src/config/geoip
  28. +13,272 −4,239 release/src/router/tor/src/config/geoip6
  29. +16 −5 release/src/router/tor/src/config/torrc.sample.in
  30. +38 −19 release/src/router/tor/src/core/mainloop/connection.c
  31. +10 −0 release/src/router/tor/src/core/mainloop/mainloop.c
  32. +5 −0 release/src/router/tor/src/core/mainloop/periodic.c
  33. +29 −5 release/src/router/tor/src/core/or/channeltls.c
  34. +28 −12 release/src/router/tor/src/core/or/circuituse.c
  35. +9 −4 release/src/router/tor/src/core/or/connection_edge.c
  36. +2 −1 release/src/router/tor/src/ext/getdelim.c
  37. +9 −1 release/src/router/tor/src/feature/client/entrynodes.c
  38. +4 −0 release/src/router/tor/src/feature/dirauth/authmode.h
  39. +7 −1 release/src/router/tor/src/feature/dirauth/bwauth.c
  40. +3 −4 release/src/router/tor/src/feature/dirauth/dirvote.c
  41. +2 −2 release/src/router/tor/src/feature/dirauth/shared_random_state.c
  42. +2 −0 release/src/router/tor/src/feature/dirauth/shared_random_state.h
  43. +1 −1 release/src/router/tor/src/feature/dircommon/consdiff.c
  44. +3 −0 release/src/router/tor/src/feature/dirparse/routerparse.c
  45. +9 −7 release/src/router/tor/src/feature/hs/hs_cell.c
  46. +0 −13 release/src/router/tor/src/feature/hs/hs_cell.h
  47. +22 −6 release/src/router/tor/src/feature/hs/hs_circuit.c
  48. +2 −1 release/src/router/tor/src/feature/hs/hs_circuit.h
  49. +15 −11 release/src/router/tor/src/feature/hs/hs_client.c
  50. +14 −13 release/src/router/tor/src/feature/hs/hs_intropoint.c
  51. +0 −15 release/src/router/tor/src/feature/hs/hs_intropoint.h
  52. +34 −9 release/src/router/tor/src/feature/hs/hs_service.c
  53. +11 −5 release/src/router/tor/src/feature/nodelist/nodelist.c
  54. +10 −8 release/src/router/tor/src/feature/nodelist/routerlist.c
  55. +2 −1 release/src/router/tor/src/feature/relay/dns.c
  56. +13 −16 release/src/router/tor/src/feature/relay/router.c
  57. +1 −1 release/src/router/tor/src/feature/relay/routerkeys.c
  58. +2 −1 release/src/router/tor/src/feature/rend/rendmid.c
  59. +15 −4 release/src/router/tor/src/feature/rend/rendservice.c
  60. +9 −2 release/src/router/tor/src/lib/container/buffers.c
  61. +8 −0 release/src/router/tor/src/lib/crypt_ops/crypto_openssl_mgt.c
  62. +31 −11 release/src/router/tor/src/lib/err/backtrace.c
  63. +1 −0 release/src/router/tor/src/lib/err/backtrace.h
  64. +9 −2 release/src/router/tor/src/lib/err/torerr.c
  65. +6 −4 release/src/router/tor/src/lib/fs/conffile.c
  66. +14 −0 release/src/router/tor/src/lib/log/util_bug.c
  67. +5 −3 release/src/router/tor/src/lib/log/util_bug.h
  68. +5 −1 release/src/router/tor/src/lib/math/fp.c
  69. +4 −3 release/src/router/tor/src/lib/meminfo/meminfo.c
  70. +15 −4 release/src/router/tor/src/lib/net/address.c
  71. +13 −3 release/src/router/tor/src/lib/string/printf.c
  72. +1 −1 release/src/router/tor/src/lib/time/compat_time.c
  73. +2 −2 release/src/router/tor/src/lib/tls/buffers_tls.c
  74. +40 −0 release/src/router/tor/src/lib/tls/tortls_nss.c
  75. +1 −1 release/src/router/tor/src/lib/tls/tortls_openssl.c
  76. +11 −0 release/src/router/tor/src/rust/Cargo.toml
  77. +2 −1 release/src/router/tor/src/test/test-memwipe.c
  78. +18 −0 release/src/router/tor/src/test/test_addr.c
  79. +3 −3 release/src/router/tor/src/test/test_address.c
  80. +47 −0 release/src/router/tor/src/test/test_circuitbuild.c
  81. +73 −7 release/src/router/tor/src/test/test_config.c
  82. +57 −0 release/src/router/tor/src/test/test_dir.c
  83. +2 −1 release/src/router/tor/src/test/test_entrynodes.c
  84. +1 −1 release/src/router/tor/src/test/test_hs_cell.c
  85. +2 −2 release/src/router/tor/src/test/test_hs_intropoint.c
  86. +2 −1 release/src/router/tor/src/test/test_key_expiration.sh
  87. +2 −1 release/src/router/tor/src/test/test_keygen.sh
  88. +25 −8 release/src/router/tor/src/test/test_rebind.py
  89. +2 −2 release/src/router/tor/src/test/test_rebind.sh
  90. +17 −5 release/src/router/tor/src/test/test_shared_random.c
  91. +2 −0 release/src/router/tor/src/test/test_util.c
  92. +2 −1 release/src/router/tor/src/test/zero_length_keys.sh
  93. +17 −27 release/src/router/tor/src/trunnel/hs/cell_introduce1.c
  94. +7 −0 release/src/router/tor/src/trunnel/hs/cell_introduce1.h
  95. +1 −1 release/src/router/tor/src/win32/orconfig.h

Large diffs are not rendered by default.

@@ -275,7 +275,7 @@ need-stem-path:
fi

test-stem: need-stem-path $(TESTING_TOR_BINARY)
@$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --log notice --target RUN_ALL;
@$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --test control.controller --test control.base_controller --test process --log notice;

test-stem-full: need-stem-path $(TESTING_TOR_BINARY)
@$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --all --log notice --target RUN_ALL,ONLINE -v;
@@ -284,8 +284,10 @@ test-full: need-stem-path need-chutney-path check test-network test-stem

test-full-online: need-stem-path need-chutney-path check test-network test-stem-full

# We can't delete the gcno files, because they are created when tor is compiled
reset-gcov:
rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda
rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \
$(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov

HTML_COVER_DIR=$(top_builddir)/coverage_html
coverage-html: all
@@ -17914,7 +17914,7 @@ need-stem-path:
fi

test-stem: need-stem-path $(TESTING_TOR_BINARY)
@$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --log notice --target RUN_ALL;
@$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --test control.controller --test control.base_controller --test process --log notice;

test-stem-full: need-stem-path $(TESTING_TOR_BINARY)
@$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --all --log notice --target RUN_ALL,ONLINE -v;
@@ -17923,8 +17923,10 @@ test-full: need-stem-path need-chutney-path check test-network test-stem

test-full-online: need-stem-path need-chutney-path check test-network test-stem-full

# We can't delete the gcno files, because they are created when tor is compiled
reset-gcov:
rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda
rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \
$(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov
coverage-html: all
@COVERAGE_ENABLED_TRUE@ test -e "`which lcov`" || (echo "lcov must be installed. See <http://ltp.sourceforge.net/coverage/lcov.php>." && false)
@COVERAGE_ENABLED_TRUE@ test -d "$(HTML_COVER_DIR)" || $(MKDIR_P) "$(HTML_COVER_DIR)"

Large diffs are not rendered by default.

@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2018 Free Software Foundation, Inc.

timestamp='2018-03-08'
timestamp='2018-08-29'

# 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,8 +84,6 @@ 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
@@ -96,34 +94,39 @@ trap 'exit 1' 1 2 15

# Portable tmp directory creation inspired by the Autoconf team.

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= ;'
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
}

# 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) >/dev/null 2>&1 ; then
if test -f /.attbin/uname ; then
PATH=$PATH:/.attbin ; export PATH
fi

@@ -138,7 +141,7 @@ Linux|GNU|GNU/*)
# We could probably try harder.
LIBC=gnu

eval "$set_cc_for_build"
set_cc_for_build
cat <<-EOF > "$dummy.c"
#include <features.h>
#if defined(__UCLIBC__)
@@ -199,7 +202,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
os=netbsdelf
;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval "$set_cc_for_build"
set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
then
@@ -237,7 +240,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.//'`
@@ -389,20 +392,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
echo i386-pc-auroraux"$UNAME_RELEASE"
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
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/[^.]*//'`"
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
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
@@ -482,7 +480,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
echo clipper-intergraph-clix"$UNAME_RELEASE"
exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
eval "$set_cc_for_build"
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
@@ -579,7 +577,7 @@ EOF
exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval "$set_cc_for_build"
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
#include <sys/systemcfg.h>
@@ -660,7 +658,7 @@ EOF
esac
fi
if [ "$HP_ARCH" = "" ]; then
eval "$set_cc_for_build"
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
#define _HPUX_SOURCE
@@ -700,7 +698,7 @@ EOF
esac
if [ "$HP_ARCH" = hppa2.0w ]
then
eval "$set_cc_for_build"
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
@@ -726,7 +724,7 @@ EOF
echo ia64-hp-hpux"$HPUX_REV"
exit ;;
3050*:HI-UX:*:*)
eval "$set_cc_for_build"
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
#include <unistd.h>
int
@@ -840,6 +838,17 @@ 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
@@ -894,8 +903,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 ;;
i*86:Minix:*:*)
echo "$UNAME_MACHINE"-pc-minix
*:Minix:*:*)
echo "$UNAME_MACHINE"-unknown-minix
exit ;;
aarch64:Linux:*:*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -922,7 +931,7 @@ EOF
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
arm*:Linux:*:*)
eval "$set_cc_for_build"
set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
@@ -971,7 +980,7 @@ EOF
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval "$set_cc_for_build"
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
#undef CPU
#undef ${UNAME_MACHINE}
@@ -1285,7 +1294,7 @@ EOF
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
eval "$set_cc_for_build"
set_cc_for_build
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
@@ -1358,6 +1367,7 @@ 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

0 comments on commit a7357b4

Please sign in to comment.
You can’t perform that action at this time.