[tor-commits] [fallback-scripts/master] update: py3: Fix module imports for py3

2020-01-19 Thread teor
commit 0f4b9ec4b1bef0effe21da30bb698abc7494d86a Author: teor Date: Mon Dec 2 15:29:20 2019 +1000 update: py3: Fix module imports for py3 Part of 28863. --- updateFallbackDirs.py | 16 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a

[tor-commits] [fallback-scripts/master] lookup: py3: Use py3's print function

2020-01-19 Thread teor
commit 108d97403fb1194952aab2dd359150f9dbd3f82d Author: teor Date: Mon Dec 2 14:55:05 2019 +1000 lookup: py3: Use py3's print function Part of 28863. --- lookupFallbackDirContact.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --

[tor-commits] [fallback-scripts/master] test: Handle the log file in Travis, not the test script

2020-01-19 Thread teor
commit 34df66d2b648b61a714b7ba5450eb15f7a7d6259 Author: teor Date: Mon Dec 2 14:45:20 2019 +1000 test: Handle the log file in Travis, not the test script Part of 28863. --- .travis.yml | 4 ++-- test.sh | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a

[tor-commits] [fallback-scripts/master] lookup: Explicitly say "no contact"

2020-01-19 Thread teor
commit 218778081da63af9b4dbe7cfddb59cab86259b07 Author: teor Date: Mon Dec 2 14:26:48 2019 +1000 lookup: Explicitly say "no contact" Rather than just printing "None". Part of 28863. --- lookupFallbackDirContact.py | 5 +++-- 1 file changed, 3 insert

[tor-commits] [fallback-scripts/master] update: py3: Use py3 exception syntax

2020-01-19 Thread teor
commit 86247cdedd318ba34f0707f62e5606e5359eafe3 Author: teor Date: Mon Dec 2 15:01:57 2019 +1000 update: py3: Use py3 exception syntax Part of 28863. --- updateFallbackDirs.py | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/updateFallbackDirs.py b

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

2020-01-15 Thread teor
commit 48187248d3f79243590d60285708f3e2d45f8d8f Merge: 7e111d0ea fb541ffca Author: teor Date: Thu Jan 16 10:00:47 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject

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

2020-01-15 Thread teor
commit 026f068bb3aed9de0f1cc6792f6c9528b7b27db2 Merge: d96b35d66 19954cffd Author: teor Date: Thu Jan 16 10:00:32 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/

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

2020-01-15 Thread teor
commit 8e3e8b0a1c27a7643706259ff7413e4e2d359124 Merge: 262906e99 026f068bb Author: teor Date: Thu Jan 16 10:00:36 2020 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/

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

2020-01-15 Thread teor
commit fb541ffca31d4906642ffb3bbe6bb6079cfcb1c9 Merge: f5461a4bd 026f068bb Author: teor Date: Thu Jan 16 10:00:40 2020 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/

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

2020-01-15 Thread teor
commit 19954cffd7710ccac778aa5cf15ae1bc6a5d56fa Merge: 0b3763612 4d70e725d Author: teor Date: Thu Jan 16 09:57:27 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 +++

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

2020-01-15 Thread teor
commit fb541ffca31d4906642ffb3bbe6bb6079cfcb1c9 Merge: f5461a4bd 026f068bb Author: teor Date: Thu Jan 16 10:00:40 2020 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/

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

2020-01-15 Thread teor
commit 2be3b8275062e34ef6a2c8d753a01b3137de739e Merge: bdc870e6f fb541ffca Author: teor Date: Thu Jan 16 10:00:44 2020 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/

[tor-commits] [tor/release-0.3.5] Do not try to shut down the event loop when it is not initialized.

2020-01-15 Thread teor
commit 4d70e725d16abc2f85d54b91f50e75c37c765087 Author: Nick Mathewson Date: Wed Nov 6 11:33:23 2019 -0500 Do not try to shut down the event loop when it is not initialized. Doing so caused us to crash in some unusual circumstances, such as using --verify-config to verify a con

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

2020-01-15 Thread teor
commit 19954cffd7710ccac778aa5cf15ae1bc6a5d56fa Merge: 0b3763612 4d70e725d Author: teor Date: Thu Jan 16 09:57:27 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 +++

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

2020-01-15 Thread teor
commit 19954cffd7710ccac778aa5cf15ae1bc6a5d56fa Merge: 0b3763612 4d70e725d Author: teor Date: Thu Jan 16 09:57:27 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 +++

[tor-commits] [tor/release-0.4.1] Do not try to shut down the event loop when it is not initialized.

2020-01-15 Thread teor
commit 4d70e725d16abc2f85d54b91f50e75c37c765087 Author: Nick Mathewson Date: Wed Nov 6 11:33:23 2019 -0500 Do not try to shut down the event loop when it is not initialized. Doing so caused us to crash in some unusual circumstances, such as using --verify-config to verify a con

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

2020-01-15 Thread teor
commit 026f068bb3aed9de0f1cc6792f6c9528b7b27db2 Merge: d96b35d66 19954cffd Author: teor Date: Thu Jan 16 10:00:32 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/

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

2020-01-15 Thread teor
commit 3bfbeff80db8d15dc47744fd49ad826b014a7b91 Merge: afa4cc57b 48187248d Author: teor Date: Thu Jan 16 10:00:51 2020 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject

[tor-commits] [tor/release-0.4.0] Do not try to shut down the event loop when it is not initialized.

2020-01-15 Thread teor
commit 4d70e725d16abc2f85d54b91f50e75c37c765087 Author: Nick Mathewson Date: Wed Nov 6 11:33:23 2019 -0500 Do not try to shut down the event loop when it is not initialized. Doing so caused us to crash in some unusual circumstances, such as using --verify-config to verify a con

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

2020-01-15 Thread teor
commit 792172ffec157594e9e35748a2de83e414ec5ab2 Merge: 23e1c1c35 19954cffd Author: teor Date: Thu Jan 16 10:00:28 2020 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/

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

2020-01-15 Thread teor
commit 19954cffd7710ccac778aa5cf15ae1bc6a5d56fa Merge: 0b3763612 4d70e725d Author: teor Date: Thu Jan 16 09:57:27 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 +++

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

2020-01-15 Thread teor
commit 026f068bb3aed9de0f1cc6792f6c9528b7b27db2 Merge: d96b35d66 19954cffd Author: teor Date: Thu Jan 16 10:00:32 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/

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

2020-01-15 Thread teor
commit 026f068bb3aed9de0f1cc6792f6c9528b7b27db2 Merge: d96b35d66 19954cffd Author: teor Date: Thu Jan 16 10:00:32 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/

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

2020-01-15 Thread teor
commit 19954cffd7710ccac778aa5cf15ae1bc6a5d56fa Merge: 0b3763612 4d70e725d Author: teor Date: Thu Jan 16 09:57:27 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 +++

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

2020-01-15 Thread teor
commit 48187248d3f79243590d60285708f3e2d45f8d8f Merge: 7e111d0ea fb541ffca Author: teor Date: Thu Jan 16 10:00:47 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject

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

2020-01-15 Thread teor
commit 19954cffd7710ccac778aa5cf15ae1bc6a5d56fa Merge: 0b3763612 4d70e725d Author: teor Date: Thu Jan 16 09:57:27 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 +++

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

2020-01-15 Thread teor
commit fb541ffca31d4906642ffb3bbe6bb6079cfcb1c9 Merge: f5461a4bd 026f068bb Author: teor Date: Thu Jan 16 10:00:40 2020 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/

[tor-commits] [tor/maint-0.4.1] Do not try to shut down the event loop when it is not initialized.

2020-01-15 Thread teor
commit 4d70e725d16abc2f85d54b91f50e75c37c765087 Author: Nick Mathewson Date: Wed Nov 6 11:33:23 2019 -0500 Do not try to shut down the event loop when it is not initialized. Doing so caused us to crash in some unusual circumstances, such as using --verify-config to verify a con

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

2020-01-15 Thread teor
commit fb541ffca31d4906642ffb3bbe6bb6079cfcb1c9 Merge: f5461a4bd 026f068bb Author: teor Date: Thu Jan 16 10:00:40 2020 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/

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

2020-01-15 Thread teor
commit 026f068bb3aed9de0f1cc6792f6c9528b7b27db2 Merge: d96b35d66 19954cffd Author: teor Date: Thu Jan 16 10:00:32 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/

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

2020-01-15 Thread teor
commit 19954cffd7710ccac778aa5cf15ae1bc6a5d56fa Merge: 0b3763612 4d70e725d Author: teor Date: Thu Jan 16 09:57:27 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 +++

[tor-commits] [tor/maint-0.3.5] Do not try to shut down the event loop when it is not initialized.

2020-01-15 Thread teor
commit 4d70e725d16abc2f85d54b91f50e75c37c765087 Author: Nick Mathewson Date: Wed Nov 6 11:33:23 2019 -0500 Do not try to shut down the event loop when it is not initialized. Doing so caused us to crash in some unusual circumstances, such as using --verify-config to verify a con

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

2020-01-15 Thread teor
commit fb541ffca31d4906642ffb3bbe6bb6079cfcb1c9 Merge: f5461a4bd 026f068bb Author: teor Date: Thu Jan 16 10:00:40 2020 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/

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

2020-01-15 Thread teor
commit 026f068bb3aed9de0f1cc6792f6c9528b7b27db2 Merge: d96b35d66 19954cffd Author: teor Date: Thu Jan 16 10:00:32 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/

[tor-commits] [tor/maint-0.4.0] Do not try to shut down the event loop when it is not initialized.

2020-01-15 Thread teor
commit 4d70e725d16abc2f85d54b91f50e75c37c765087 Author: Nick Mathewson Date: Wed Nov 6 11:33:23 2019 -0500 Do not try to shut down the event loop when it is not initialized. Doing so caused us to crash in some unusual circumstances, such as using --verify-config to verify a con

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

2020-01-15 Thread teor
commit 19954cffd7710ccac778aa5cf15ae1bc6a5d56fa Merge: 0b3763612 4d70e725d Author: teor Date: Thu Jan 16 09:57:27 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 +++

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

2020-01-15 Thread teor
commit 48187248d3f79243590d60285708f3e2d45f8d8f Merge: 7e111d0ea fb541ffca Author: teor Date: Thu Jan 16 10:00:47 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject

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

2020-01-15 Thread teor
commit 026f068bb3aed9de0f1cc6792f6c9528b7b27db2 Merge: d96b35d66 19954cffd Author: teor Date: Thu Jan 16 10:00:32 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/

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

2020-01-15 Thread teor
commit 4025cbada6ab01247275faec8dd32ae857ef0fd5 Merge: f3cbc26bd 48187248d Author: teor Date: Thu Jan 16 10:00:55 2020 +1000 Merge branch 'maint-0.4.2' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torp

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

2020-01-15 Thread teor
commit 19954cffd7710ccac778aa5cf15ae1bc6a5d56fa Merge: 0b3763612 4d70e725d Author: teor Date: Thu Jan 16 09:57:27 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 +++

[tor-commits] [tor/master] add_c_file: Fix "control line not preceded by a blank line"

2020-01-15 Thread teor
commit f3cbc26bdd0d26c5bd80d2c3bc40f90d70a814f5 Author: teor Date: Thu Jan 16 09:38:26 2020 +1000 add_c_file: Fix "control line not preceded by a blank line" Fix dirauth and relay module include.am add_c_file.py "control line not preceded by a blank line" e

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

2020-01-15 Thread teor
commit 5fa7c1b13fbefcfd9b71a1f95922cf4e92b5e141 Merge: d430b5a07 165a92e33 Author: teor Date: Thu Jan 16 00:46:31 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1661' changes/log_32868 | 4 +++ src/feature/nodelist/node_sel

[tor-commits] [tor/master] Replace an assertion with a check-and-log

2020-01-15 Thread teor
commit 165a92e33f3dc6123c1cd3326c6b183ac1c1d778 Author: Nick Mathewson Date: Tue Jan 14 13:16:39 2020 -0500 Replace an assertion with a check-and-log We hit this assertion with bug 32868, but I'm stymied figuring out how we wound up with a routerstatus like this. This patch is

[tor-commits] [torspec/master] dir-list-spec: Modify "source=" line format

2020-01-15 Thread teor
commit 33c70fcd2e724ce7bf8835fbf766f6aee355bb87 Author: teor Date: Mon Dec 9 16:21:07 2019 +1000 dir-list-spec: Modify "source=" line format * Rename "whitelist" to "offer-list" for 32699. * Add "descriptor" for 24839. * Allow mul

[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/99'

2020-01-15 Thread teor
commit e99deb888e172d01268b542f85b5af31497c1825 Merge: ff165e0 33c70fc Author: teor Date: Thu Jan 16 00:14:40 2020 +1000 Merge remote-tracking branch 'tor-github/pr/99' dir-list-spec.txt | 30 ++ 1 file changed, 22 insertions(+), 8

[tor-commits] [fallback-scripts/master] update: Rename fallback.whitelist to fallback_offer_list

2020-01-15 Thread teor
commit fd37bd0af93c8cbc66901e71a03f7cb52d57070e Author: teor Date: Mon Dec 9 16:02:12 2019 +1000 update: Rename fallback.whitelist to fallback_offer_list The input list is a list of potential fallbacks, that relay operators have offered to have hard-coded in Tor. To avoid

[tor-commits] [fallback-scripts/master] update: Implement version 3.0.0 of the dir-list-spec

2020-01-15 Thread teor
commit 0a715b55abf1870415d0f538e6d44aa73838b1a1 Author: teor Date: Mon Dec 9 16:27:35 2019 +1000 update: Implement version 3.0.0 of the dir-list-spec Change "source=whitelist" to "source=offer-list". Part of 32699 and 24839. --- updateFallbackDirs.py

[tor-commits] [torspec/master] Prop 306: Add an optional ClientPreferIPv6ORPort consensus parameter

2020-01-15 Thread teor
commit 6664ed79ed4688209065e39a4eafb5e2bb59de66 Author: teor Date: Mon Jan 13 20:27:24 2020 +1000 Prop 306: Add an optional ClientPreferIPv6ORPort consensus parameter Part of 29801. --- proposals/306-ipv6-happy-eyeballs.txt | 8 ++-- 1 file changed, 6 insertions(+), 2

[tor-commits] [torspec/master] Prop 306: Improve ConnectionAttemptDelay design

2020-01-15 Thread teor
commit ed8452b9e85385579ea902777d19ec0252b4e4c5 Author: teor Date: Mon Jan 13 20:25:40 2020 +1000 Prop 306: Improve ConnectionAttemptDelay design Have a single ConnectionAttemptDelay option, with a default value of 250 msec based on RFC 8305. Part of 29801

[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/102'

2020-01-15 Thread teor
commit ff165e0f449d09ee3c872016e5abc35cf75e918c Merge: 36b3b2c e27cbca Author: teor Date: Wed Jan 15 22:50:10 2020 +1000 Merge remote-tracking branch 'tor-github/pr/102' proposals/306-ipv6-happy-eyeballs.txt | 340 +++--- 1 file changed, 193 insertio

[tor-commits] [torspec/master] Prop 306: Add a bootstrap changes section

2020-01-15 Thread teor
commit 21aaad10e60b667a7de896ffcb42667567fbe53c Author: teor Date: Mon Jan 13 20:31:00 2020 +1000 Prop 306: Add a bootstrap changes section Clients need to change how they select fallback directory mirrors during bootstrap, or some IPv6-only clients will fail to bootstrap

[tor-commits] [torspec/master] Prop 306: Restore some statistics from an earlier draft

2020-01-15 Thread teor
commit e27cbca30600faf9db14404ae87d9798c3f0e4b1 Author: teor Date: Wed Jan 15 22:40:44 2020 +1000 Prop 306: Restore some statistics from an earlier draft These statistics are optional, but they may be useful: * client and relay connections * statistics in the heartbeat

[tor-commits] [torspec/master] Prop306: Add revisions suggested in Torspec PR #87

2020-01-15 Thread teor
Attempt Delays +3.3. Connection Attempt Delays As mentioned in [TEOR-P306-REP], initially, clients should prefer IPv4 by default. The Connection Attempt Delay, or delay between IPv4 and IPv6 - connections should be 1.5 seconds. This is to avoid the overhead from - tunneled IPv6 connecti

[tor-commits] [torspec/master] Prop 306: Minor fixes and tidying up

2020-01-15 Thread teor
commit a78e23a053415a2aa498ff611e4131762a264d53 Author: teor Date: Mon Jan 13 20:21:40 2020 +1000 Prop 306: Minor fixes and tidying up * modify design to match Tor's typical design patterns * add some missing info and special cases * improve formatting and consis

[tor-commits] [torspec/master] Prop 306: Improve load-balancing for NumIPv6Guards

2020-01-15 Thread teor
commit f5c6f61cc9833d5de9d4c36e26a3e21ec701f7cf Author: teor Date: Mon Jan 13 20:29:14 2020 +1000 Prop 306: Improve load-balancing for NumIPv6Guards The previous design would have doubled the load on IPv6-supporting relays. Part of 29801. --- proposals/306-ipv6-happy

[tor-commits] [tor/master] practracker: Fail tests if any process exits unexpectedly

2020-01-15 Thread teor
commit eb55d85e757c62a483e0e4ccb231ec33a1df84f3 Author: teor Date: Tue Jan 14 17:20:36 2020 +1000 practracker: Fail tests if any process exits unexpectedly Part of 32705. --- scripts/maint/practracker/test_practracker.sh | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions

[tor-commits] [tor/master] practracker: Test practracker exit status

2020-01-15 Thread teor
commit fa038e561757d4280957db715da0a3392e8084f2 Author: teor Date: Tue Jan 14 17:23:41 2020 +1000 practracker: Test practracker exit status Part of 32705. --- scripts/maint/practracker/test_practracker.sh | 2 +- scripts/maint/practracker/testdata/ex0-expected.txt

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

2020-01-15 Thread teor
commit d430b5a0749b4f1256b64e6d36ea684e9ba1cae8 Merge: b7cfca1de 54eec5342 Author: teor Date: Wed Jan 15 22:31:10 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1634' "Ours" merge, because ticket 32883 replaces this code with calls to tor_run_main(

[tor-commits] [tor/master] practracker: Capture stderr output in test_practracker.sh

2020-01-15 Thread teor
commit cda2ff196540f3b1fe8639e4e647285b58bb6752 Author: teor Date: Thu Dec 12 16:15:29 2019 +1000 practracker: Capture stderr output in test_practracker.sh And canonicalise file paths, so that output is consistent, even in out-of-tree builds. Capturing stderr output

[tor-commits] [tor/master] practracker: Wrap long lines in the test script

2020-01-15 Thread teor
commit b910ae8cd18973d8cd846583599cf62a723b58fa Author: teor Date: Tue Jan 14 17:24:11 2020 +1000 practracker: Wrap long lines in the test script --- scripts/maint/practracker/test_practracker.sh | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a

[tor-commits] [tor/master] Initialize publish/subscribe code when running as an NT service.

2020-01-15 Thread teor
commit 54eec5342d45e9add5b9a8fee0167267c38f63f9 Author: Nick Mathewson Date: Mon Jan 6 08:45:29 2020 -0500 Initialize publish/subscribe code when running as an NT service. Fixes bug 32778; bugfix on 0.4.1.1-alpha. --- changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++--

[tor-commits] [tor/master] Merge branch 'pr1599_squashed'

2020-01-15 Thread teor
commit b7cfca1dee4d4435f87c2e7b7233f51a956c56ee Merge: c80694dec b910ae8cd Author: teor Date: Wed Jan 15 22:31:01 2020 +1000 Merge branch 'pr1599_squashed' scripts/maint/practracker/test_practracker.sh | 32 -- .../maint/practracker/testdata/ex0-ex

[tor-commits] [tor/master] scripts/git: Fix git-merge-forward after removing 0.2.9

2020-01-14 Thread teor
commit 536eeb4589b1ce6f9cbbd36ec73cd5dd9e84ceaa Author: teor Date: Wed Jan 15 12:22:38 2020 +1000 scripts/git: Fix git-merge-forward after removing 0.2.9 We need a test branch for the earliest maint branch (maint-0.3.5), but we can't merge forward into it, because there

[tor-commits] [tor/master] scripts/git: Improve branch list comments

2020-01-14 Thread teor
commit c80694deccb6f7d00cf97415a75f0c85fabd9131 Author: teor Date: Wed Jan 15 12:28:00 2020 +1000 scripts/git: Improve branch list comments Hopefully, these explanations make it easier to get the next branch transition right. Part of 32772. --- scripts/git/git-merge

[tor-commits] [tor/release-0.4.2] test_practracker.sh: never disable practracker

2020-01-13 Thread teor
commit 6b1592b56439ddbb9e47444f77de2d03429cc0ff Author: Nick Mathewson Date: Mon Jan 13 16:17:51 2020 -0500 test_practracker.sh: never disable practracker When practracker is disabled, its output will be empty. We don't want that happening during our tests. Fixes bug

[tor-commits] [tor/maint-0.4.2] test_practracker.sh: never disable practracker

2020-01-13 Thread teor
commit 6b1592b56439ddbb9e47444f77de2d03429cc0ff Author: Nick Mathewson Date: Mon Jan 13 16:17:51 2020 -0500 test_practracker.sh: never disable practracker When practracker is disabled, its output will be empty. We don't want that happening during our tests. Fixes bug

[tor-commits] [tor/maint-0.4.2] practracker: print a notice to stderr when disabled

2020-01-13 Thread teor
commit 7e111d0eaa05d5099d101e82afa1709438fe994e Author: teor Date: Tue Jan 14 17:32:11 2020 +1000 practracker: print a notice to stderr when disabled When TOR_DISABLE_PRACTRACKER is set, print a message to stderr when skipping practracker checks. Part of 32705

[tor-commits] [tor/master] practracker: print a notice to stderr when disabled

2020-01-13 Thread teor
commit 7e111d0eaa05d5099d101e82afa1709438fe994e Author: teor Date: Tue Jan 14 17:32:11 2020 +1000 practracker: print a notice to stderr when disabled When TOR_DISABLE_PRACTRACKER is set, print a message to stderr when skipping practracker checks. Part of 32705

[tor-commits] [tor/release-0.4.2] practracker: print a notice to stderr when disabled

2020-01-13 Thread teor
commit 7e111d0eaa05d5099d101e82afa1709438fe994e Author: teor Date: Tue Jan 14 17:32:11 2020 +1000 practracker: print a notice to stderr when disabled When TOR_DISABLE_PRACTRACKER is set, print a message to stderr when skipping practracker checks. Part of 32705

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

2020-01-13 Thread teor
commit afa4cc57bf101eb3effbd233fc3d18265279fe8e Merge: f1173a63f 7e111d0ea Author: teor Date: Tue Jan 14 17:41:40 2020 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 changes/ticket32705_disable | 7 +++ scripts/maint/practracker/practracker.p

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

2020-01-13 Thread teor
commit 8095c785f1929b379ab3341b42cbdb05c7598950 Merge: 8b46372f2 7e111d0ea Author: teor Date: Tue Jan 14 17:41:44 2020 +1000 Merge branch 'maint-0.4.2' changes/ticket32705_disable | 7 +++ scripts/maint/practracker/practracker.py | 2 ++ scr

[tor-commits] [tor/master] test_practracker.sh: never disable practracker

2020-01-13 Thread teor
commit 6b1592b56439ddbb9e47444f77de2d03429cc0ff Author: Nick Mathewson Date: Mon Jan 13 16:17:51 2020 -0500 test_practracker.sh: never disable practracker When practracker is disabled, its output will be empty. We don't want that happening during our tests. Fixes bug

[tor-commits] [tor/master] router: Improve port search function comments

2020-01-07 Thread teor
commit a58cffe195caff042a3785813447025ab13d8bbc Author: teor Date: Wed Jan 8 17:46:28 2020 +1000 router: Improve port search function comments --- src/feature/relay/router.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/feature/relay/router.c b/src/feature

[tor-commits] [chutney/master] Travis: Run pypy with Tor 0.4.2 on Xenial

2019-12-19 Thread teor
commit 5a9271104fec6c5b9bb23d2574596dc9d7c0a2c4 Author: teor Date: Fri Dec 20 10:29:53 2019 +1000 Travis: Run pypy with Tor 0.4.2 on Xenial * PyPy isn't packaged for Travis Bionic yet * Tor master doesn't work on Travis Xenial, because it only has OpenSSL 1.1.

[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035

2019-12-19 Thread teor
commit 0b3763612cfd74fd8e1ee79f6fbe58a70e4288b8 Merge: 75096de4c 434248664 Author: teor Date: Mon Dec 16 09:21:05 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035 .travis.yml | 3 +-- changes/ticket32242 | 2 ++ 2 files changed, 3

[tor-commits] [tor/release-0.4.2] Merge branch 'bug32240_32242_041' into bug32240_32242_042

2019-12-19 Thread teor
commit 8b5c11fbf6a408147e61ce96812faebca1580c61 Merge: da404910a 84c4ede05 Author: teor Date: Mon Dec 16 09:23:46 2019 +1000 Merge branch 'bug32240_32242_041' into bug32240_32242_042 .travis.yml | 3 +-- changes/ticket32242 | 2 ++ 2 files changed, 3 insertions(+), 2

[tor-commits] [tor/release-0.4.2] Merge branch 'bug32240_029' into bug32240_035

2019-12-19 Thread teor
commit 75096de4c7ade9d8e734017d46714378bf3ae94c Merge: 1cd20ff84 37b04aeed Author: teor Date: Mon Dec 16 09:09:16 2019 +1000 Merge branch 'bug32240_029' into bug32240_035 Merge * Chutney Trusty deletion in bug32240_029 * NSS addition in maint-0.3.5 .

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

2019-12-19 Thread teor
commit 72376378714fef727004830157da79be97821a60 Merge: ffccf6fc5 d96b35d66 Author: teor Date: Fri Dec 20 10:12:43 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 10 -- changes/ticket32240 | 4 changes/ticket32242 | 2 ++ 3 files c

[tor-commits] [tor/release-0.4.2] Merge branch 'bug32240_035' into bug32240_040

2019-12-19 Thread teor
commit e2f78396f400dff5b28f6fdf845a9bcf7a8d1b85 Merge: 748117298 75096de4c Author: teor Date: Mon Dec 16 09:14:32 2019 +1000 Merge branch 'bug32240_035' into bug32240_040 .travis.yml | 7 +++ changes/ticket32240 | 4 2 files changed, 7 insertions(+), 4

[tor-commits] [tor/release-0.4.2] Travis: Use zstd in our Travis Linux builds

2019-12-19 Thread teor
commit 43424866496e6f7613ec652c798fec3b8b460c6d Author: teor Date: Wed Oct 23 22:35:24 2019 +1000 Travis: Use zstd in our Travis Linux builds Recent Ubuntu versions have zstd >= 1.1, which is an optional tor build dependency. Closes ticket 32242. --- .travis.

[tor-commits] [tor/release-0.4.2] changes: file for 32240

2019-12-19 Thread teor
commit 37b04aeed7d6c7acb8b7edf2bcd6ee08f9c3a54c Author: teor Date: Mon Dec 16 09:06:25 2019 +1000 changes: file for 32240 --- changes/ticket32240 | 4 1 file changed, 4 insertions(+) diff --git a/changes/ticket32240 b/changes/ticket32240 new file mode 100644 index 0

[tor-commits] [tor/release-0.4.2] Travis: Run Chutney jobs in Ubuntu Bionic images

2019-12-19 Thread teor
commit 0f07d252436bcc3b86c0003ea0a8fe14e13428b0 Author: teor Date: Mon Dec 16 09:03:48 2019 +1000 Travis: Run Chutney jobs in Ubuntu Bionic images Closes 32240. --- .travis.yml | 4 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1d56d64d4

[tor-commits] [tor/release-0.4.2] Merge branch 'bug32240_32242_040' into bug32240_32242_041

2019-12-19 Thread teor
commit 84c4ede052bc642677d9f53f9802e6d69ca647df Merge: 4a34fd5b7 d96b35d66 Author: teor Date: Mon Dec 16 09:23:41 2019 +1000 Merge branch 'bug32240_32242_040' into bug32240_32242_041 .travis.yml | 3 +-- changes/ticket32242 | 2 ++ 2 files changed, 3 insertions(+), 2

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

2019-12-19 Thread teor
commit 5dbb607e9472ee7fb42091ae7dc0c7f2550c4425 Merge: 8b5c11fbf 723763787 Author: teor Date: Fri Dec 20 10:12:51 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject

[tor-commits] [tor/release-0.4.1] Travis: Turn off Tor's Sandbox in Chutney jobs

2019-12-19 Thread teor
commit 704f3224a2058329f23f9567873e77215e441701 Author: teor Date: Mon Dec 16 09:01:45 2019 +1000 Travis: Turn off Tor's Sandbox in Chutney jobs We need to set "Sandbox 0", until we fix sandbox errors that are triggered by Ubuntu Xenial and Bionic. See 32722.

[tor-commits] [tor/release-0.4.1] Merge branch 'bug32240_035' into bug32240_040

2019-12-19 Thread teor
commit e2f78396f400dff5b28f6fdf845a9bcf7a8d1b85 Merge: 748117298 75096de4c Author: teor Date: Mon Dec 16 09:14:32 2019 +1000 Merge branch 'bug32240_035' into bug32240_040 .travis.yml | 7 +++ changes/ticket32240 | 4 2 files changed, 7 insertions(+), 4

[tor-commits] [tor/release-0.4.2] Merge branch 'bug32240_041' into bug32240_042

2019-12-19 Thread teor
commit da404910a7cb25c20baf3fbf5e7a6a056bdbe9df Merge: bd11fb109 4a34fd5b7 Author: teor Date: Mon Dec 16 09:15:42 2019 +1000 Merge branch 'bug32240_041' into bug32240_042 Merge: * CHUTNEY_TOR_SANDBOX=0 from bug32240_041 * RUST_VERSION from maint-0.4.2 .

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

2019-12-19 Thread teor
commit 72376378714fef727004830157da79be97821a60 Merge: ffccf6fc5 d96b35d66 Author: teor Date: Fri Dec 20 10:12:43 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 10 -- changes/ticket32240 | 4 changes/ticket32242 | 2 ++ 3 files c

[tor-commits] [tor/release-0.4.1] Merge branch 'bug32240_029' into bug32240_035

2019-12-19 Thread teor
commit 75096de4c7ade9d8e734017d46714378bf3ae94c Merge: 1cd20ff84 37b04aeed Author: teor Date: Mon Dec 16 09:09:16 2019 +1000 Merge branch 'bug32240_029' into bug32240_035 Merge * Chutney Trusty deletion in bug32240_029 * NSS addition in maint-0.3.5 .

[tor-commits] [tor/release-0.4.2] Merge branch 'bug32240_32242_035' into bug32240_32242_040

2019-12-19 Thread teor
commit d96b35d6639b1c2f6a57f9d84007544c334c963b Merge: e2f78396f 0b3763612 Author: teor Date: Mon Dec 16 09:22:52 2019 +1000 Merge branch 'bug32240_32242_035' into bug32240_32242_040 Merge: * libzstd-dev from ticket32242_035 * shellcheck from maint-0.4.0 .

[tor-commits] [tor/release-0.4.2] Travis: Turn off Tor's Sandbox in Chutney jobs

2019-12-19 Thread teor
commit 704f3224a2058329f23f9567873e77215e441701 Author: teor Date: Mon Dec 16 09:01:45 2019 +1000 Travis: Turn off Tor's Sandbox in Chutney jobs We need to set "Sandbox 0", until we fix sandbox errors that are triggered by Ubuntu Xenial and Bionic. See 32722.

[tor-commits] [tor/release-0.4.1] changes: file for 32240

2019-12-19 Thread teor
commit 37b04aeed7d6c7acb8b7edf2bcd6ee08f9c3a54c Author: teor Date: Mon Dec 16 09:06:25 2019 +1000 changes: file for 32240 --- changes/ticket32240 | 4 1 file changed, 4 insertions(+) diff --git a/changes/ticket32240 b/changes/ticket32240 new file mode 100644 index 0

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

2019-12-19 Thread teor
commit 75096de4c7ade9d8e734017d46714378bf3ae94c Merge: 1cd20ff84 37b04aeed Author: teor Date: Mon Dec 16 09:09:16 2019 +1000 Merge branch 'bug32240_029' into bug32240_035 Merge * Chutney Trusty deletion in bug32240_029 * NSS addition in maint-0.3.5 .

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

2019-12-19 Thread teor
commit 664a2c0755156bce2947338bf08edc1f02326e1d Merge: d5702a634 5dbb607e9 Author: teor Date: Fri Dec 20 10:12:55 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 .travis.yml | 10 -- changes/ticket32240 | 4 changes/ticket32242 | 2 ++ 3 files c

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

2019-12-19 Thread teor
commit 0b3763612cfd74fd8e1ee79f6fbe58a70e4288b8 Merge: 75096de4c 434248664 Author: teor Date: Mon Dec 16 09:21:05 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035 .travis.yml | 3 +-- changes/ticket32242 | 2 ++ 2 files changed, 3

[tor-commits] [tor/release-0.4.2] Merge branch 'bug32240_040' into bug32240_041

2019-12-19 Thread teor
commit 4a34fd5b746fcbd712607323cb48cfcd6e72456f Merge: ffccf6fc5 e2f78396f Author: teor Date: Mon Dec 16 09:14:38 2019 +1000 Merge branch 'bug32240_040' into bug32240_041 .travis.yml | 7 +++ changes/ticket32240 | 4 2 files changed, 7 insertions(+), 4

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

2019-12-19 Thread teor
commit e2f78396f400dff5b28f6fdf845a9bcf7a8d1b85 Merge: 748117298 75096de4c Author: teor Date: Mon Dec 16 09:14:32 2019 +1000 Merge branch 'bug32240_035' into bug32240_040 .travis.yml | 7 +++ changes/ticket32240 | 4 2 files changed, 7 insertions(+), 4

[tor-commits] [tor/release-0.4.0] Travis: Turn off Tor's Sandbox in Chutney jobs

2019-12-19 Thread teor
commit 704f3224a2058329f23f9567873e77215e441701 Author: teor Date: Mon Dec 16 09:01:45 2019 +1000 Travis: Turn off Tor's Sandbox in Chutney jobs We need to set "Sandbox 0", until we fix sandbox errors that are triggered by Ubuntu Xenial and Bionic. See 32722.

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

2019-12-19 Thread teor
commit 69d7ea4db963155e6133bc724d4639ea1bd31d1c Merge: 7c2e1f6dd 723763787 Author: teor Date: Fri Dec 20 10:12:47 2019 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 .travis.yml | 10 -- changes/ticket32240 | 4 changes/ticket32242 | 2 ++ 3 files c

[tor-commits] [tor/release-0.3.5] Travis: Turn off Tor's Sandbox in Chutney jobs

2019-12-19 Thread teor
commit 704f3224a2058329f23f9567873e77215e441701 Author: teor Date: Mon Dec 16 09:01:45 2019 +1000 Travis: Turn off Tor's Sandbox in Chutney jobs We need to set "Sandbox 0", until we fix sandbox errors that are triggered by Ubuntu Xenial and Bionic. See 32722.

<    2   3   4   5   6   7   8   9   10   11   >