[tor-commits] [chutney/master] Travis: show the correct macOS tor versions

2019-06-10 Thread teor
commit 65ca1288d123565b248d6849131f98d02f2c3e9b Author: teor Date: Fri May 24 15:13:52 2019 +1000 Travis: show the correct macOS tor versions Closes ticket 30820. --- .travis.yml | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml

[tor-commits] [chutney/master] Travis: add a note about v2 onion service IPv6 tests

2019-06-10 Thread teor
commit 6a44c9f4ef5f3991776535fabae0c1aa0850f4f7 Author: teor Date: Mon Jun 10 20:26:35 2019 +1000 Travis: add a note about v2 onion service IPv6 tests See #23588 for v3 onion service IPv6 in tor. See #30279 for v3 onion service IPv6 in chutney CI. --- .travis.yml | 2 ++ 1

[tor-commits] [tor/release-0.3.5] Travis: Skip test_rebind on macOS builds

2019-06-10 Thread teor
commit be0a4be276c945e4e90b43ce8f784b5b75bef122 Author: teor Date: Mon Jun 10 18:59:02 2019 +1000 Travis: Skip test_rebind on macOS builds Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable is set. Skip test_rebind on macOS in Travis builds, because

[tor-commits] [tor/maint-0.3.5] Add changes file

2019-06-10 Thread teor
commit 6b2d8b1a7c81cce0ee357ba74e494f1438ef3cbf Author: rl1987 Date: Sun Apr 21 21:06:57 2019 +0300 Add changes file --- changes/ticket30213 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket30213 b/changes/ticket30213 new file mode 100644 index 0..acb761480 ---

[tor-commits] [tor/maint-0.3.5] Travis: Skip test_rebind on macOS builds

2019-06-10 Thread teor
commit be0a4be276c945e4e90b43ce8f784b5b75bef122 Author: teor Date: Mon Jun 10 18:59:02 2019 +1000 Travis: Skip test_rebind on macOS builds Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable is set. Skip test_rebind on macOS in Travis builds, because

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5

2019-06-10 Thread teor
commit dcb8cad4e65022820c1660838e72b5b5ea67f850 Merge: a742a80ee d761c3ca6 Author: teor Date: Tue Jun 11 14:51:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5 .travis.yml | 4 changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --cc

[tor-commits] [tor/maint-0.3.5] test: Also avoid reading the system default torrc in integration tests

2019-06-10 Thread teor
commit 12b9bfc05f3a163b44f0f8b6638f027de16e622b Author: teor Date: Wed Apr 10 19:03:43 2019 +1000 test: Also avoid reading the system default torrc in integration tests Part of 29702. --- changes/ticket29702 | 6 +++--- src/test/test_key_expiration.sh | 3 ++-

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5

2019-06-10 Thread teor
commit a742a80eeaf12e238c5b2e9eb06d8edbc8797c2b Merge: 202ccc393 be0a4be27 Author: teor Date: Tue Jun 11 14:51:37 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5 .travis.yml | 2 ++ changes/bug30713| 5 + src/test/test_rebind.py | 7

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5

2019-06-10 Thread teor
commit a58c4cc6dd905acb5ab5c29c0152e792b27dd428 Merge: cb20054cc 9a97b5ff5 Author: teor Date: Tue Jun 11 14:47:40 2019 +1000 Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5 .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+)

[tor-commits] [tor/release-0.4.0] Travis: remove sudo configuration

2019-06-10 Thread teor
commit 5c00b25c0e63380ec175353f8f389d9bede31a5a Author: rl1987 Date: Wed Apr 24 13:29:23 2019 +0300 Travis: remove sudo configuration See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration --- .travis.yml | 22 +- 1 file changed, 1

[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5

2019-06-10 Thread teor
commit cb20054ccda422ddf5af29d4bf5c55fa3a701e1f Merge: e5deb2bbc 12b9bfc05 Author: teor Date: Tue Jun 11 14:46:24 2019 +1000 Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5 changes/ticket29702 | 4 src/test/test_key_expiration.sh | 3 ++-

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5

2019-06-10 Thread teor
commit 202ccc3930be8d93424303cc13a5c80c58c07817 Merge: a58c4cc6d 6b2d8b1a7 Author: teor Date: Tue Jun 11 14:48:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5 .travis.yml | 22 +- changes/ticket30213 | 3 +++ 2 files changed, 4

[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5

2019-06-10 Thread teor
commit a58c4cc6dd905acb5ab5c29c0152e792b27dd428 Merge: cb20054cc 9a97b5ff5 Author: teor Date: Tue Jun 11 14:47:40 2019 +1000 Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5 .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+)

[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5

2019-06-10 Thread teor
commit a742a80eeaf12e238c5b2e9eb06d8edbc8797c2b Merge: 202ccc393 be0a4be27 Author: teor Date: Tue Jun 11 14:51:37 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5 .travis.yml | 2 ++ changes/bug30713| 5 + src/test/test_rebind.py | 7

[tor-commits] [tor/release-0.4.1] Travis: remove sudo configuration

2019-06-10 Thread teor
commit 5c00b25c0e63380ec175353f8f389d9bede31a5a Author: rl1987 Date: Wed Apr 24 13:29:23 2019 +0300 Travis: remove sudo configuration See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration --- .travis.yml | 22 +- 1 file changed, 1

[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5

2019-06-10 Thread teor
commit dcb8cad4e65022820c1660838e72b5b5ea67f850 Merge: a742a80ee d761c3ca6 Author: teor Date: Tue Jun 11 14:51:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5 .travis.yml | 4 changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --cc

[tor-commits] [tor/maint-0.3.5] Add changes file

2019-06-10 Thread teor
commit acec0192c3d6400316037cdc3e4c9093c1919252 Author: rl1987 Date: Wed Mar 13 18:51:41 2019 +0200 Add changes file --- changes/ticket29702 | 4 1 file changed, 4 insertions(+) diff --git a/changes/ticket29702 b/changes/ticket29702 new file mode 100644 index 0..d2cacd55d

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5

2019-06-10 Thread teor
commit a58c4cc6dd905acb5ab5c29c0152e792b27dd428 Merge: cb20054cc 9a97b5ff5 Author: teor Date: Tue Jun 11 14:47:40 2019 +1000 Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5 .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+)

[tor-commits] [chutney/master] Add a function to test whether we have ipv6 support.

2019-06-10 Thread teor
commit 31c4ad44f5f124f3e69d480a1b4d99ecd86dd10e Author: Nick Mathewson Date: Thu May 9 11:45:02 2019 -0400 Add a function to test whether we have ipv6 support. --- lib/chutney/Host.py | 20 1 file changed, 20 insertions(+) diff --git a/lib/chutney/Host.py

[tor-commits] [chutney/master] Mark all ipv6 networks as requiring ipv6.

2019-06-10 Thread teor
commit 79105ffac06e96b53dd7d9c2cbbb8d947f008059 Author: Nick Mathewson Date: Thu May 9 13:11:45 2019 -0400 Mark all ipv6 networks as requiring ipv6. --- networks/bridges+ipv6| 1 + networks/bridges+ipv6+hs | 1 + networks/bridges+ipv6+hs-v2 | 1 +

[tor-commits] [translation/torbutton-securitylevelproperties] Update translations for torbutton-securitylevelproperties

2019-06-10 Thread translation
commit 82832c25df4f8a25c10de383031a8d43e739ad39 Author: Translation commit bot Date: Mon Jun 10 20:19:50 2019 + Update translations for torbutton-securitylevelproperties --- da/securitylevel.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/torbutton-torbuttondtd_completed] Update translations for torbutton-torbuttondtd_completed

2019-06-10 Thread translation
commit 9cd1f212beb17c93bdb08f6f136e33616b12310e Author: Translation commit bot Date: Mon Jun 10 20:19:13 2019 + Update translations for torbutton-torbuttondtd_completed --- da/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/torbutton.dtd

[tor-commits] [translation/torbutton-securitylevelproperties_completed] Update translations for torbutton-securitylevelproperties_completed

2019-06-10 Thread translation
commit 3b7919db28cad6a0a65b36cd60859020d3dc76f1 Author: Translation commit bot Date: Mon Jun 10 20:19:56 2019 + Update translations for torbutton-securitylevelproperties_completed --- da/securitylevel.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/release-0.4.1] test: fix a typo in test_rebind.sh

2019-06-10 Thread nickm
commit b9041e8a631beda9762fcd0627fa91045086410d Author: teor Date: Mon Jun 10 20:56:40 2019 +1000 test: fix a typo in test_rebind.sh Closes 30821. --- src/test/test_rebind.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rebind.sh

[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1

2019-06-10 Thread nickm
commit c0285320df4e52530129ca515de08245d035c889 Merge: 765e4364d b9041e8a6 Author: Nick Mathewson Date: Mon Jun 10 18:31:23 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1 src/test/test_rebind.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.4.1'

2019-06-10 Thread nickm
commit c8e09dd0d2bab75cee4f0683eb61636bbebb50d4 Merge: df8e2bbc0 c0285320d Author: Nick Mathewson Date: Mon Jun 10 18:31:36 2019 -0400 Merge branch 'maint-0.4.1' src/test/test_rebind.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

[tor-commits] [tor/maint-0.4.1] test: fix a typo in test_rebind.sh

2019-06-10 Thread nickm
commit b9041e8a631beda9762fcd0627fa91045086410d Author: teor Date: Mon Jun 10 20:56:40 2019 +1000 test: fix a typo in test_rebind.sh Closes 30821. --- src/test/test_rebind.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rebind.sh

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1

2019-06-10 Thread nickm
commit c0285320df4e52530129ca515de08245d035c889 Merge: 765e4364d b9041e8a6 Author: Nick Mathewson Date: Mon Jun 10 18:31:23 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1 src/test/test_rebind.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1

2019-06-10 Thread nickm
commit c0285320df4e52530129ca515de08245d035c889 Merge: 765e4364d b9041e8a6 Author: Nick Mathewson Date: Mon Jun 10 18:31:23 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1 src/test/test_rebind.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] test: fix a typo in test_rebind.sh

2019-06-10 Thread nickm
commit b9041e8a631beda9762fcd0627fa91045086410d Author: teor Date: Mon Jun 10 20:56:40 2019 +1000 test: fix a typo in test_rebind.sh Closes 30821. --- src/test/test_rebind.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rebind.sh

[tor-commits] [chutney/master] Add a "supported" command that checks whether a network can work.

2019-06-10 Thread teor
commit 43d034bb1b00171f3d0607c7fcd7fd7c120f76e9 Author: Nick Mathewson Date: Thu May 9 13:06:25 2019 -0400 Add a "supported" command that checks whether a network can work. Right now a network is unsupported if it requires IPV6 and we don't have it, if the directory

[tor-commits] [chutney/master] Merge remote-tracking branch 'tor-github/pr/32'

2019-06-10 Thread teor
commit ebaac297961e88390aaf0e5612d87df3fdec8639 Merge: 6a44c9f 79105ff Author: teor Date: Tue Jun 11 14:40:40 2019 +1000 Merge remote-tracking branch 'tor-github/pr/32' lib/chutney/Host.py | 20 lib/chutney/TorNet.py| 202

[tor-commits] [chutney/master] test scripts: If a network is not supported, exit with 77

2019-06-10 Thread teor
commit d8c700e178e171cb49c37a76c574c97ced5295e1 Author: Nick Mathewson Date: Thu May 9 13:07:57 2019 -0400 test scripts: If a network is not supported, exit with 77 This will help automake's test drivers realize that it has been skipped. --- tools/bootstrap-network.sh | 5

[tor-commits] [chutney/master] Preliminary: add a memoization decorator

2019-06-10 Thread teor
commit de96081be3a40378819e14419e7e7f91845cc8c9 Author: Nick Mathewson Date: Thu May 9 11:41:35 2019 -0400 Preliminary: add a memoization decorator We memoize enough things in enough places that we should provide an actual decorator for this. --- lib/chutney/TorNet.py | 65

[tor-commits] [tor/maint-0.3.5] Travis: Show stem's tor log after failure

2019-06-10 Thread teor
commit 9a97b5ff56fc6f29d93ee515eb7244fe4db34c66 Author: teor Date: Mon Apr 22 11:48:07 2019 +1000 Travis: Show stem's tor log after failure Closes ticket 30234. --- .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.travis.yml

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5

2019-06-10 Thread teor
commit cb20054ccda422ddf5af29d4bf5c55fa3a701e1f Merge: e5deb2bbc 12b9bfc05 Author: teor Date: Tue Jun 11 14:46:24 2019 +1000 Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5 changes/ticket29702 | 4 src/test/test_key_expiration.sh | 3 ++-

[tor-commits] [tor/maint-0.3.5] Travis: allow the test-stem job to fail

2019-06-10 Thread teor
commit d761c3ca6de62ecdced9933a0717bf3ee598b073 Author: teor Date: Mon Jun 10 19:18:35 2019 +1000 Travis: allow the test-stem job to fail Allow the test-stem job to fail in Travis, because it sometimes hangs. Fixes bug 30744; bugfix on 0.3.5.4-alpha. --- .travis.yml

[tor-commits] [tor/maint-0.3.5] Travis: remove sudo configuration

2019-06-10 Thread teor
commit 5c00b25c0e63380ec175353f8f389d9bede31a5a Author: rl1987 Date: Wed Apr 24 13:29:23 2019 +0300 Travis: remove sudo configuration See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration --- .travis.yml | 22 +- 1 file changed, 1

[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5

2019-06-10 Thread teor
commit dcb8cad4e65022820c1660838e72b5b5ea67f850 Merge: a742a80ee d761c3ca6 Author: teor Date: Tue Jun 11 14:51:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5 .travis.yml | 4 changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --cc

[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5

2019-06-10 Thread teor
commit cb20054ccda422ddf5af29d4bf5c55fa3a701e1f Merge: e5deb2bbc 12b9bfc05 Author: teor Date: Tue Jun 11 14:46:24 2019 +1000 Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5 changes/ticket29702 | 4 src/test/test_key_expiration.sh | 3 ++-

[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-06-10 Thread teor
commit 2779ce1f6fbcb9a80284246593758e5fce71d718 Merge: 5b07ff401 4ca18fde9 Author: teor Date: Tue Jun 11 14:52:36 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-06-10 Thread teor
commit 4ca18fde93642976da326e207e62791780aad56f Merge: c8447f95e dcb8cad4e Author: teor Date: Tue Jun 11 14:52:27 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.1] Travis: remove sudo configuration

2019-06-10 Thread teor
commit 5c00b25c0e63380ec175353f8f389d9bede31a5a Author: rl1987 Date: Wed Apr 24 13:29:23 2019 +0300 Travis: remove sudo configuration See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration --- .travis.yml | 22 +- 1 file changed, 1

[tor-commits] [tor/master] Merge branch 'maint-0.4.1'

2019-06-10 Thread teor
commit e9f1e975df89bbb08fb183ede5629e4025b44c44 Merge: cfa943f14 2779ce1f6 Author: teor Date: Tue Jun 11 14:52:40 2019 +1000 Merge branch 'maint-0.4.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5

2019-06-10 Thread teor
commit a742a80eeaf12e238c5b2e9eb06d8edbc8797c2b Merge: 202ccc393 be0a4be27 Author: teor Date: Tue Jun 11 14:51:37 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5 .travis.yml | 2 ++ changes/bug30713| 5 + src/test/test_rebind.py | 7

[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5

2019-06-10 Thread teor
commit dcb8cad4e65022820c1660838e72b5b5ea67f850 Merge: a742a80ee d761c3ca6 Author: teor Date: Tue Jun 11 14:51:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5 .travis.yml | 4 changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --cc

[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-06-10 Thread teor
commit 4ca18fde93642976da326e207e62791780aad56f Merge: c8447f95e dcb8cad4e Author: teor Date: Tue Jun 11 14:52:27 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5

2019-06-10 Thread teor
commit 202ccc3930be8d93424303cc13a5c80c58c07817 Merge: a58c4cc6d 6b2d8b1a7 Author: teor Date: Tue Jun 11 14:48:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5 .travis.yml | 22 +- changes/ticket30213 | 3 +++ 2 files changed, 4

[tor-commits] [tor/release-0.3.5] Use empty torrc file when launching tor in test_rebind.py

2019-06-10 Thread teor
commit 93dcfc659300f9ad5277ec531612013e4b8a13d3 Author: rl1987 Date: Wed Mar 13 17:53:51 2019 +0200 Use empty torrc file when launching tor in test_rebind.py --- src/test/test_rebind.py | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/test_rebind.py

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5

2019-06-10 Thread teor
commit a742a80eeaf12e238c5b2e9eb06d8edbc8797c2b Merge: 202ccc393 be0a4be27 Author: teor Date: Tue Jun 11 14:51:37 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5 .travis.yml | 2 ++ changes/bug30713| 5 + src/test/test_rebind.py | 7

[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5

2019-06-10 Thread teor
commit 202ccc3930be8d93424303cc13a5c80c58c07817 Merge: a58c4cc6d 6b2d8b1a7 Author: teor Date: Tue Jun 11 14:48:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5 .travis.yml | 22 +- changes/ticket30213 | 3 +++ 2 files changed, 4

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5

2019-06-10 Thread teor
commit dcb8cad4e65022820c1660838e72b5b5ea67f850 Merge: a742a80ee d761c3ca6 Author: teor Date: Tue Jun 11 14:51:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5 .travis.yml | 4 changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --cc

[tor-commits] [tor/release-0.4.0] Add changes file

2019-06-10 Thread teor
commit 6b2d8b1a7c81cce0ee357ba74e494f1438ef3cbf Author: rl1987 Date: Sun Apr 21 21:06:57 2019 +0300 Add changes file --- changes/ticket30213 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket30213 b/changes/ticket30213 new file mode 100644 index 0..acb761480 ---

[tor-commits] [tor/release-0.3.5] Travis: Show stem's tor log after failure

2019-06-10 Thread teor
commit 9a97b5ff56fc6f29d93ee515eb7244fe4db34c66 Author: teor Date: Mon Apr 22 11:48:07 2019 +1000 Travis: Show stem's tor log after failure Closes ticket 30234. --- .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.travis.yml

[tor-commits] [tor/release-0.3.5] Add changes file

2019-06-10 Thread teor
commit 6b2d8b1a7c81cce0ee357ba74e494f1438ef3cbf Author: rl1987 Date: Sun Apr 21 21:06:57 2019 +0300 Add changes file --- changes/ticket30213 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket30213 b/changes/ticket30213 new file mode 100644 index 0..acb761480 ---

[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5

2019-06-10 Thread teor
commit a58c4cc6dd905acb5ab5c29c0152e792b27dd428 Merge: cb20054cc 9a97b5ff5 Author: teor Date: Tue Jun 11 14:47:40 2019 +1000 Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5 .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+)

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5

2019-06-10 Thread teor
commit a58c4cc6dd905acb5ab5c29c0152e792b27dd428 Merge: cb20054cc 9a97b5ff5 Author: teor Date: Tue Jun 11 14:47:40 2019 +1000 Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5 .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+)

[tor-commits] [tor/release-0.3.5] Travis: allow the test-stem job to fail

2019-06-10 Thread teor
commit d761c3ca6de62ecdced9933a0717bf3ee598b073 Author: teor Date: Mon Jun 10 19:18:35 2019 +1000 Travis: allow the test-stem job to fail Allow the test-stem job to fail in Travis, because it sometimes hangs. Fixes bug 30744; bugfix on 0.3.5.4-alpha. --- .travis.yml

[tor-commits] [tor/release-0.4.1] Add changes file

2019-06-10 Thread teor
commit 6b2d8b1a7c81cce0ee357ba74e494f1438ef3cbf Author: rl1987 Date: Sun Apr 21 21:06:57 2019 +0300 Add changes file --- changes/ticket30213 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket30213 b/changes/ticket30213 new file mode 100644 index 0..acb761480 ---

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5

2019-06-10 Thread teor
commit 202ccc3930be8d93424303cc13a5c80c58c07817 Merge: a58c4cc6d 6b2d8b1a7 Author: teor Date: Tue Jun 11 14:48:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5 .travis.yml | 22 +- changes/ticket30213 | 3 +++ 2 files changed, 4

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5

2019-06-10 Thread teor
commit cb20054ccda422ddf5af29d4bf5c55fa3a701e1f Merge: e5deb2bbc 12b9bfc05 Author: teor Date: Tue Jun 11 14:46:24 2019 +1000 Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5 changes/ticket29702 | 4 src/test/test_key_expiration.sh | 3 ++-

[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-06-10 Thread teor
commit 4ca18fde93642976da326e207e62791780aad56f Merge: c8447f95e dcb8cad4e Author: teor Date: Tue Jun 11 14:52:27 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

2019-06-10 Thread teor
commit 50dcbf26122d82eb8a6e6b41db82d88608eadd32 Merge: 66c307751 4ca18fde9 Author: teor Date: Tue Jun 11 14:52:32 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-06-10 Thread teor
commit 2779ce1f6fbcb9a80284246593758e5fce71d718 Merge: 5b07ff401 4ca18fde9 Author: teor Date: Tue Jun 11 14:52:36 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.3.5] test: Also avoid reading the system default torrc in integration tests

2019-06-10 Thread teor
commit 12b9bfc05f3a163b44f0f8b6638f027de16e622b Author: teor Date: Wed Apr 10 19:03:43 2019 +1000 test: Also avoid reading the system default torrc in integration tests Part of 29702. --- changes/ticket29702 | 6 +++--- src/test/test_key_expiration.sh | 3 ++-

[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5

2019-06-10 Thread teor
commit a742a80eeaf12e238c5b2e9eb06d8edbc8797c2b Merge: 202ccc393 be0a4be27 Author: teor Date: Tue Jun 11 14:51:37 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5 .travis.yml | 2 ++ changes/bug30713| 5 + src/test/test_rebind.py | 7

[tor-commits] [tor/release-0.3.5] Add changes file

2019-06-10 Thread teor
commit acec0192c3d6400316037cdc3e4c9093c1919252 Author: rl1987 Date: Wed Mar 13 18:51:41 2019 +0200 Add changes file --- changes/ticket29702 | 4 1 file changed, 4 insertions(+) diff --git a/changes/ticket29702 b/changes/ticket29702 new file mode 100644 index 0..d2cacd55d

[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5

2019-06-10 Thread teor
commit a742a80eeaf12e238c5b2e9eb06d8edbc8797c2b Merge: 202ccc393 be0a4be27 Author: teor Date: Tue Jun 11 14:51:37 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5 .travis.yml | 2 ++ changes/bug30713| 5 + src/test/test_rebind.py | 7

[tor-commits] [tor/release-0.3.5] Travis: remove sudo configuration

2019-06-10 Thread teor
commit 5c00b25c0e63380ec175353f8f389d9bede31a5a Author: rl1987 Date: Wed Apr 24 13:29:23 2019 +0300 Travis: remove sudo configuration See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration --- .travis.yml | 22 +- 1 file changed, 1

[tor-commits] [tor/maint-0.4.0] Add changes file

2019-06-10 Thread teor
commit 6b2d8b1a7c81cce0ee357ba74e494f1438ef3cbf Author: rl1987 Date: Sun Apr 21 21:06:57 2019 +0300 Add changes file --- changes/ticket30213 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket30213 b/changes/ticket30213 new file mode 100644 index 0..acb761480 ---

[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-06-10 Thread teor
commit 4ca18fde93642976da326e207e62791780aad56f Merge: c8447f95e dcb8cad4e Author: teor Date: Tue Jun 11 14:52:27 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5

2019-06-10 Thread teor
commit cb20054ccda422ddf5af29d4bf5c55fa3a701e1f Merge: e5deb2bbc 12b9bfc05 Author: teor Date: Tue Jun 11 14:46:24 2019 +1000 Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5 changes/ticket29702 | 4 src/test/test_key_expiration.sh | 3 ++-

[tor-commits] [tor/maint-0.4.1] Add changes file

2019-06-10 Thread teor
commit 6b2d8b1a7c81cce0ee357ba74e494f1438ef3cbf Author: rl1987 Date: Sun Apr 21 21:06:57 2019 +0300 Add changes file --- changes/ticket30213 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket30213 b/changes/ticket30213 new file mode 100644 index 0..acb761480 ---

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5

2019-06-10 Thread teor
commit cb20054ccda422ddf5af29d4bf5c55fa3a701e1f Merge: e5deb2bbc 12b9bfc05 Author: teor Date: Tue Jun 11 14:46:24 2019 +1000 Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5 changes/ticket29702 | 4 src/test/test_key_expiration.sh | 3 ++-

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5

2019-06-10 Thread teor
commit 202ccc3930be8d93424303cc13a5c80c58c07817 Merge: a58c4cc6d 6b2d8b1a7 Author: teor Date: Tue Jun 11 14:48:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5 .travis.yml | 22 +- changes/ticket30213 | 3 +++ 2 files changed, 4

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5

2019-06-10 Thread teor
commit dcb8cad4e65022820c1660838e72b5b5ea67f850 Merge: a742a80ee d761c3ca6 Author: teor Date: Tue Jun 11 14:51:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5 .travis.yml | 4 changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --cc

[tor-commits] [tor/master] Add changes file

2019-06-10 Thread teor
commit 6b2d8b1a7c81cce0ee357ba74e494f1438ef3cbf Author: rl1987 Date: Sun Apr 21 21:06:57 2019 +0300 Add changes file --- changes/ticket30213 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket30213 b/changes/ticket30213 new file mode 100644 index 0..acb761480 ---

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5

2019-06-10 Thread teor
commit a742a80eeaf12e238c5b2e9eb06d8edbc8797c2b Merge: 202ccc393 be0a4be27 Author: teor Date: Tue Jun 11 14:51:37 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5 .travis.yml | 2 ++ changes/bug30713| 5 + src/test/test_rebind.py | 7

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-06-10 Thread teor
commit 2779ce1f6fbcb9a80284246593758e5fce71d718 Merge: 5b07ff401 4ca18fde9 Author: teor Date: Tue Jun 11 14:52:36 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5

2019-06-10 Thread teor
commit 202ccc3930be8d93424303cc13a5c80c58c07817 Merge: a58c4cc6d 6b2d8b1a7 Author: teor Date: Tue Jun 11 14:48:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5 .travis.yml | 22 +- changes/ticket30213 | 3 +++ 2 files changed, 4

[tor-commits] [tor/master] Travis: remove sudo configuration

2019-06-10 Thread teor
commit 5c00b25c0e63380ec175353f8f389d9bede31a5a Author: rl1987 Date: Wed Apr 24 13:29:23 2019 +0300 Travis: remove sudo configuration See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration --- .travis.yml | 22 +- 1 file changed, 1

[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-06-10 Thread teor
commit 4ca18fde93642976da326e207e62791780aad56f Merge: c8447f95e dcb8cad4e Author: teor Date: Tue Jun 11 14:52:27 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5

2019-06-10 Thread teor
commit cb20054ccda422ddf5af29d4bf5c55fa3a701e1f Merge: e5deb2bbc 12b9bfc05 Author: teor Date: Tue Jun 11 14:46:24 2019 +1000 Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5 changes/ticket29702 | 4 src/test/test_key_expiration.sh | 3 ++-

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5

2019-06-10 Thread teor
commit dcb8cad4e65022820c1660838e72b5b5ea67f850 Merge: a742a80ee d761c3ca6 Author: teor Date: Tue Jun 11 14:51:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5 .travis.yml | 4 changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --cc

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5

2019-06-10 Thread teor
commit a58c4cc6dd905acb5ab5c29c0152e792b27dd428 Merge: cb20054cc 9a97b5ff5 Author: teor Date: Tue Jun 11 14:47:40 2019 +1000 Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5 .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+)

[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5

2019-06-10 Thread teor
commit 202ccc3930be8d93424303cc13a5c80c58c07817 Merge: a58c4cc6d 6b2d8b1a7 Author: teor Date: Tue Jun 11 14:48:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5 .travis.yml | 22 +- changes/ticket30213 | 3 +++ 2 files changed, 4

[tor-commits] [tor/maint-0.4.0] Travis: remove sudo configuration

2019-06-10 Thread teor
commit 5c00b25c0e63380ec175353f8f389d9bede31a5a Author: rl1987 Date: Wed Apr 24 13:29:23 2019 +0300 Travis: remove sudo configuration See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration --- .travis.yml | 22 +- 1 file changed, 1

[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5

2019-06-10 Thread teor
commit a58c4cc6dd905acb5ab5c29c0152e792b27dd428 Merge: cb20054cc 9a97b5ff5 Author: teor Date: Tue Jun 11 14:47:40 2019 +1000 Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5 .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+)

[tor-commits] [tor/maint-0.3.5] Use empty torrc file when launching tor in test_rebind.py

2019-06-10 Thread teor
commit 93dcfc659300f9ad5277ec531612013e4b8a13d3 Author: rl1987 Date: Wed Mar 13 17:53:51 2019 +0200 Use empty torrc file when launching tor in test_rebind.py --- src/test/test_rebind.py | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/test_rebind.py

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2019-06-10 Thread teor
commit eb7f55df88cb5a298efef6b9ef9b8bf6c7ad6338 Merge: 252960f2e dcb8cad4e Author: teor Date: Tue Jun 11 14:52:23 2019 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 .travis.yml | 29 - changes/bug30713| 5 +

[tor-commits] [tor/release-0.4.0] Travis: Skip test_rebind on macOS builds

2019-06-10 Thread nickm
commit be0a4be276c945e4e90b43ce8f784b5b75bef122 Author: teor Date: Mon Jun 10 18:59:02 2019 +1000 Travis: Skip test_rebind on macOS builds Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable is set. Skip test_rebind on macOS in Travis builds, because

[tor-commits] [tor/maint-0.4.1] Travis: Skip test_rebind on macOS builds

2019-06-10 Thread nickm
commit be0a4be276c945e4e90b43ce8f784b5b75bef122 Author: teor Date: Mon Jun 10 18:59:02 2019 +1000 Travis: Skip test_rebind on macOS builds Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable is set. Skip test_rebind on macOS in Travis builds, because

[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

2019-06-10 Thread nickm
commit 0fe3b373acfff401059bcbf13ed1503aa19d0c69 Merge: 463ded569 430dd2da6 Author: Nick Mathewson Date: Mon Jun 10 18:33:26 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 .travis.yml | 2 ++ changes/bug30713| 5 + src/test/test_rebind.py | 7 +++

[tor-commits] [tor/master] Merge branch 'maint-0.4.1'

2019-06-10 Thread nickm
commit d6b411a3514d65b5cabd2505ae4642e763074142 Merge: c8e09dd0d 6a72cc259 Author: Nick Mathewson Date: Mon Jun 10 18:33:26 2019 -0400 Merge branch 'maint-0.4.1' .travis.yml | 2 ++ changes/bug30713| 5 + src/test/test_rebind.py | 7 +++

[tor-commits] [tor/release-0.4.0] Merge branch 'bug30713_035' into bug30713_040

2019-06-10 Thread nickm
commit 430dd2da6e97c7186b03caabbbac95d74c3d8b82 Merge: 6a6f7eb67 be0a4be27 Author: teor Date: Mon Jun 10 20:50:53 2019 +1000 Merge branch 'bug30713_035' into bug30713_040 .travis.yml | 2 ++ changes/bug30713| 5 + src/test/test_rebind.py | 7 +++

[tor-commits] [tor/maint-0.4.1] Merge branch 'bug30713_035' into bug30713_040

2019-06-10 Thread nickm
commit 430dd2da6e97c7186b03caabbbac95d74c3d8b82 Merge: 6a6f7eb67 be0a4be27 Author: teor Date: Mon Jun 10 20:50:53 2019 +1000 Merge branch 'bug30713_035' into bug30713_040 .travis.yml | 2 ++ changes/bug30713| 5 + src/test/test_rebind.py | 7 +++

[tor-commits] [tor/release-0.4.1] Travis: Skip test_rebind on macOS builds

2019-06-10 Thread nickm
commit be0a4be276c945e4e90b43ce8f784b5b75bef122 Author: teor Date: Mon Jun 10 18:59:02 2019 +1000 Travis: Skip test_rebind on macOS builds Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable is set. Skip test_rebind on macOS in Travis builds, because

[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-06-10 Thread nickm
commit 6a72cc25983850fb23bd21adb181b38c0ead2c5a Merge: c0285320d 430dd2da6 Author: Nick Mathewson Date: Mon Jun 10 18:33:26 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 2 ++ changes/bug30713| 5 + src/test/test_rebind.py | 7 +++

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-06-10 Thread nickm
commit 6a72cc25983850fb23bd21adb181b38c0ead2c5a Merge: c0285320d 430dd2da6 Author: Nick Mathewson Date: Mon Jun 10 18:33:26 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 2 ++ changes/bug30713| 5 + src/test/test_rebind.py | 7 +++

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2019-06-10 Thread translation
commit ec828d8f372b8e98b8777cb7c40aaba69078d42c Author: Translation commit bot Date: Tue Jun 11 01:16:06 2019 + Update translations for https_everywhere_completed --- pt_BR/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/pt_BR/https-everywhere.dtd

  1   2   >