June 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit 765e4364d97cea17affef7413cda5fa02eb8f347 Merge: ecc5feff3 5d4b4f948 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 09:37:17 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1 changes/doc30630 | 3 +++ doc/HACKING/ReleasingTor.md | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.1] Mention Travis/Appveyor/Jenkins URLs in ReleasingTor.md
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit 5d4b4f948a338a41966bb2e15af5875d4df8a08f Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri May 31 09:35:19 2019 +0300 Mention Travis/Appveyor/Jenkins URLs in ReleasingTor.md --- changes/doc30630 | 3 +++ doc/HACKING/ReleasingTor.md | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/doc30630 b/changes/doc30630 new file mode 100644 index 000000000..0fbd8d4dd --- /dev/null +++ b/changes/doc30630 @@ -0,0 +1,3 @@ + o Documentation: + - Mention URLs for Travis/Appveyor/Jenkins in ReleasingTor.md. Closes + ticket 30630. diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index 4c87a366c..d9864dba2 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -20,8 +20,11 @@ new Tor release: === I. Make sure it works -1. Make sure that CI passes: have a look at Travis, Appveyor, and - Jenkins. Make sure you're looking at the right branches. +1. Make sure that CI passes: have a look at Travis + (https://travis-ci.org/torproject/tor/branches) Appveyor + (https://ci.appveyor.com/project/torproject/tor/history) and + Jenkins (https://jenkins.torproject.org/view/tor/) + Make sure you're looking at the right branches. If there are any unexplained failures, try to fix them or figure them out. @@ -244,3 +247,5 @@ new Tor release: master branch. 3. Keep an eye on the blog post, to moderate comments and answer questions. + +

1 0

[tor/master] Bump master to 0.4.2.0-alpha-dev
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit adc7b50eae6e5cdcfaccdb09f7faf5ace33934d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 08:47:33 2019 -0400 Bump master to 0.4.2.0-alpha-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 05b932973..b9060a62a 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.1.2-alpha-dev]) +AC_INIT([tor],[0.4.2.0-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # 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, ["2019-06-06"], # for 0.4.1.2-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-06-10"], # for 0.4.2.0-alpha-dev [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 700744d95..1c96b1868 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.1.2-alpha-dev" +!define VERSION "0.4.2.0-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 768c6210c..25bfb9ada 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.1.2-alpha-dev" +#define VERSION "0.4.2.0-alpha-dev"

1 0

[chutney/master] Revert "Travis: show the correct macOS tor versions"
by teor＠torproject.org 10 Jun '19

10 Jun '19

commit 5af047be98acd688cf6c27bac5191297ead70536 Author: teor <teor(a)torproject.org> Date: Mon Jun 10 20:02:35 2019 +1000 Revert "Travis: show the correct macOS tor versions" This reverts commit f90f8e4b0d4c8263d0e310a0fa020dda7fe6c91c. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97703f9..30ec9cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,20 +30,20 @@ matrix: - env: NETWORK_FLAVOUR="hs-v2-min" - env: NETWORK_FLAVOUR="hs-v3-min" - env: NETWORK_FLAVOUR="single-onion-v23" - - env: NETWORK_FLAVOUR="bridges+ipv6-min" TOR="stable-release" + - env: NETWORK_FLAVOUR="bridges+ipv6-min" os: osx language: c python: ## The IPv6 exit test doesn't actually require IPv6, see #30182. ## But we'll keep this test, because it does test IPv6 exit config. - env: NETWORK_FLAVOUR="ipv6-exit-min" - - env: NETWORK_FLAVOUR="hs-v23-ipv6-md" TOR="stable-release" + - env: NETWORK_FLAVOUR="hs-v23-ipv6-md" os: osx language: c python: ## We expect this test to fail, until #23588 is merged into tor master, and ## built into a nightly binary - - env: NETWORK_FLAVOUR="single-onion-v23-ipv6-md" TOR="stable-release" + - env: NETWORK_FLAVOUR="single-onion-v23-ipv6-md" os: osx language: c python:

1 0

[chutney/master] Revert "Travis: test IPv6-only v3 single onion services on tor master"
by teor＠torproject.org 10 Jun '19

10 Jun '19

commit 601a3b9007d0087d384e225457c3ef71fdc3b0c0 Author: teor <teor(a)torproject.org> Date: Mon Jun 10 20:02:51 2019 +1000 Revert "Travis: test IPv6-only v3 single onion services on tor master" This reverts commit 7782b26767c95988255c5d5884df94580e22c5c3. --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 30ec9cf..e97703f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,9 +41,7 @@ matrix: os: osx language: c python: - ## We expect this test to fail, until #23588 is merged into tor master, and - ## built into a nightly binary - - env: NETWORK_FLAVOUR="single-onion-v23-ipv6-md" + - env: NETWORK_FLAVOUR="single-onion-ipv6-md" os: osx language: c python:

1 0

[chutney/master] Travis: Remove unsupported python versions
by teor＠torproject.org 10 Jun '19

10 Jun '19

commit 4ededb9876831b0c675f638dd9df426b44939cee Author: teor <teor(a)torproject.org> Date: Mon Apr 15 14:45:56 2019 +1000 Travis: Remove unsupported python versions They're not really telling us anything useful. --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d015a13..6db6687 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,12 +105,6 @@ matrix: ## End of Life: 1 January 2020 ## https://www.python.org/dev/peps/pep-0373/#id2 - python: "2.7" - ## Final Release: 17 March 2019 - ## https://www.python.org/dev/peps/pep-0429/#release-schedule - - python: "3.4" - ## Final Release: 17 March 2019 - ## https://www.python.org/dev/peps/pep-0478/#id4 - - python: "3.5" ## End of Life: December 2021 ## https://www.python.org/dev/peps/pep-0494/#lifespan - python: "3.6"

1 0

[chutney/master] Travis: Remove debug run from after_failure
by teor＠torproject.org 10 Jun '19

10 Jun '19

commit 993c345b2509a184df3f82df26b88843867bb249 Author: teor <teor(a)torproject.org> Date: Tue Apr 9 12:37:21 2019 +1000 Travis: Remove debug run from after_failure It's not actually helping us diagnose the errors that we're seeing. (--allow-failures is pretty good for that.) Part of 30066. --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f5c1d62..74ae900 100644 --- a/.travis.yml +++ b/.travis.yml @@ -191,9 +191,6 @@ after_failure: #- cat net/nodes/00*a*/state - for f in net/nodes/00*a*/v3-status-votes ; do echo "$f"; cat "$f"; done - for f in net/nodes/00*a*/unparseable-descs/* ; do echo "$f"; cat "$f"; done - ## Re-run chutney in debug mode - ## TODO: improve debug mode - - tools/test-network.sh --debug && echo "chutney debug run succeeded" notifications: irc:

1 0

[chutney/master] Travis: use basic-min rather than bridges+hs-v2 by default
by teor＠torproject.org 10 Jun '19

10 Jun '19

commit 8b911a762be3b8c410dc2ee502135e49a6fc7803 Author: teor <teor(a)torproject.org> Date: Mon Apr 15 14:42:42 2019 +1000 Travis: use basic-min rather than bridges+hs-v2 by default Reduces the complexity of the network, decreasing load and increasing reliability. Part of 30066. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd9fd03..d015a13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,6 @@ matrix: ## The latest tor version in homebrew is on this page: ## https://formulae.brew.sh/formula/tor ## The Travis version might be slightly older. - - env: NETWORK_FLAVOUR="basic-min" - env: NETWORK_FLAVOUR="bridges-min" - env: NETWORK_FLAVOUR="hs-min" - env: NETWORK_FLAVOUR="single-onion" @@ -161,10 +160,11 @@ dist: xenial ## Default is Xcode 9.4 on macOS 10.13 as of August 2018 #osx_image: xcode9.4 -## This env var isn't used by the build, but it's useful for debugging -## It should be kept in sync with the Linux tor version below +## The TOR env var should be kept in sync with the Linux tor version below +## We use the basic-min network by default, to reduce load and increase +## reliability env: - - TOR="stable-release" + - TOR="stable-release" NETWORK_FLAVOUR="basic-min" ## Download our dependencies addons:

1 0

[chutney/master] Travis: switch to tor master by default
by teor＠torproject.org 10 Jun '19

10 Jun '19

commit fb6ad9c8c8a50d1c21cf733d671ad8fcefde2f07 Author: teor <teor(a)torproject.org> Date: Mon Apr 15 14:56:18 2019 +1000 Travis: switch to tor master by default --- .travis.yml | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6db6687..2f11021 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,8 @@ os: ## We also use macOS for some networks matrix: - # include creates Linux, python 2.7, tor stable builds by default + # include creates Linux, python 2.7, tor master builds by default + # we use tor master to catch tor issues before stable releases # the key(s) in each item override these defaults include: ## Test different network flavours @@ -68,36 +69,36 @@ matrix: - shellcheck - tor env: TOR="0.3.4-nightly" - ## The current stable release is listed at the end of the file, because - ## it is the default for other build variants + ## The current stable release is 0.3.5, so we don't have a separate + ## 0.3.5-stable job - addons: apt: sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.3.5.x-xenial main' + - sourceline: 'deb https://deb.torproject.org/torproject.org xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - shellcheck - tor - env: TOR="0.3.5-nightly" - ## The experimental deb line needs to be updated when 0.4.0 becomes stable + env: TOR="stable-release" - addons: apt: sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org tor-experimental-0.4.0.x-xenial main' + - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.3.5.x-xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - shellcheck - tor - env: TOR="0.4.0-nightly" + env: TOR="0.3.5-nightly" + ## The experimental deb line needs to be updated when 0.4.0 becomes stable - addons: apt: sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-master-xenial main' + - sourceline: 'deb https://deb.torproject.org/torproject.org tor-experimental-0.4.0.x-xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - shellcheck - tor - env: TOR="master-nightly" + env: TOR="0.4.0-nightly" ## Test all supported python releases ## Pre-installed in Travis xenial: @@ -158,16 +159,14 @@ dist: xenial ## We use the basic-min network by default, to reduce load and increase ## reliability env: - - TOR="stable-release" NETWORK_FLAVOUR="basic-min" + - TOR="master-nightly" NETWORK_FLAVOUR="basic-min" ## Download our dependencies addons: ## (Linux only) apt: sources: - ## Xenial has Tor 0.2.7, so we need a newer version of Tor from the - ## torproject repositories, and the torproject key from deb.tpo - - sourceline: 'deb https://deb.torproject.org/torproject.org xenial main' + - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-master-xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - shellcheck

1 0

[chutney/master] Travis: do networks in separate builds, and features in script steps
by teor＠torproject.org 10 Jun '19

10 Jun '19

commit 3d3ba342178280110a5bafa403ce9e8a12e5419c Author: teor <teor(a)torproject.org> Date: Mon Apr 15 11:33:37 2019 +1000 Travis: do networks in separate builds, and features in script steps We can't use Linux for IPv6 networks, because Travis Linux does not support IPv6. Temporarily disable some unreliable feature tests, until we fix some bugs. Part of 30066. --- .travis.yml | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 50 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 74ae900..fd9fd03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,23 +6,45 @@ python: "2.7" os: - linux - ## We add a single macOS build below + ## We also use macOS for some networks matrix: # include creates Linux, python 2.7, tor stable builds by default # the key(s) in each item override these defaults include: - ## Test macOS with its default python version, which is currently 2.7. - ## (But we don't show the version, because Travis might change it without - ## us noticing.) - ## Use language: c to work around an issue with language: python on macOS. - ## We get the tor version in the homebrew cache on the macOS image - ## The current tor version in homebrew is on this page: - ## https://formulae.brew.sh/formula/tor - - os: osx + ## Test different network flavours + ## We're using the 0.2.9 networks from tor's "make test-network-all" + ## + ## We need to use macOS to test IPv6 networks, because Travis Linux doesn't + ## support IPv6. But macOS is tricky: + ## - We use the default python version on macOS, which is currently 2.7. + ## (But we don't show the version, because Travis might change it + ## without us noticing.) + ## - We use language: c, because language: python fails on Travis macOS. + ## - We get the tor version in the homebrew cache on the macOS image. + ## The latest tor version in homebrew is on this page: + ## https://formulae.brew.sh/formula/tor + ## The Travis version might be slightly older. + - env: NETWORK_FLAVOUR="basic-min" + - env: NETWORK_FLAVOUR="bridges-min" + - env: NETWORK_FLAVOUR="hs-min" + - env: NETWORK_FLAVOUR="single-onion" + - env: NETWORK_FLAVOUR="bridges+ipv6-min" + os: osx language: c python: - env: TOR="stable-release" + ## The IPv6 exit test doesn't actually require IPv6, see #30182. + ## But we'll keep this test, because it does test IPv6 exit config. + - env: NETWORK_FLAVOUR="ipv6-exit-min" + - env: NETWORK_FLAVOUR="hs-ipv6" + os: osx + language: c + python: + - env: NETWORK_FLAVOUR="single-onion-ipv6" + os: osx + language: c + python: + ## Test all supported and available tor versions on Linux ## If the deb.torproject.org repositories are removed, we will fall back to ## Ubuntu security's tor version (currently 0.2.9.14). We might want to @@ -77,6 +99,7 @@ matrix: - shellcheck - tor env: TOR="master-nightly" + ## Test all supported python releases ## Pre-installed in Travis xenial: ## https://docs.travis-ci.com/user/reference/xenial/#python-support @@ -171,9 +194,23 @@ install: - tor --version script: + ## Basic tests - tests/shellcheck-tests.sh - tests/unit-tests.sh - - tools/test-network.sh --allow-failures 1 + ## Quick smoke test + - tools/test-network.sh --dry-run + ## Now, allow one failure for each test (--allow-failures 1) + - export CHUTNEY_ALLOW_FAILURES=1 + ## Different data directory + - tools/test-network.sh --net-dir "$(mktemp -d)" + ## IP address handling + - tools/test-network.sh --ipv4 "127.0.0.1" --ipv6 "[::1]" + ## Offline mode + - tools/test-network.sh --offline + ## --data fails on python3, and on some tor versions + ## We'll fix this issue in #30071 + #- FIVE_MEGABYTES=$((5*1024*1024)) + #- tools/test-network.sh --data "$FIVE_MEGABYTES" --connections 2 --rounds 2 --hs-multi-client 1 --start-time 130 --bootstrap-time 70 --stop-time 10 after_failure: ## List the contents of net/nodes @@ -191,6 +228,8 @@ after_failure: #- cat net/nodes/00*a*/state - for f in net/nodes/00*a*/v3-status-votes ; do echo "$f"; cat "$f"; done - for f in net/nodes/00*a*/unparseable-descs/* ; do echo "$f"; cat "$f"; done + ## And repeat the warnings at the end + - tools/test-network.sh --only-warnings notifications: irc:

1 0