[tor-commits] [tor/master] scripts/git: Fix a variable name typo in git-push-all.sh

2019-10-22 Thread teor
commit 71191fa3dcc29d24aee9a22d1d9f2584316e818f Author: teor Date: Wed Oct 23 13:00:35 2019 +1000 scripts/git: Fix a variable name typo in git-push-all.sh Obviously correct changes to already reviewed code. --- scripts/git/git-push-all.sh | 2 +- 1 file changed, 1 insertion(+), 1

[tor-commits] [tor/master] changes: file for 29603

2019-10-22 Thread teor
commit d804a81cf1b43fe9382821e79c3ac588c6a9967d Author: teor Date: Wed Oct 23 12:26:32 2019 +1000 changes: file for 29603 We merged this change without a changes file. --- changes/ticket29603 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket29603

[tor-commits] [translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties

2019-10-22 Thread translation
commit 82283a1de7481582e7a8469cbabf475606d154a3 Author: Translation commit bot Date: Wed Oct 23 00:45:54 2019 + https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties --- zh_CN/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[tor-commits] [translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed

2019-10-22 Thread translation
commit 45e17aeec0ddfd72fe44fc224075730d6045de31 Author: Translation commit bot Date: Wed Oct 23 00:45:23 2019 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- zh_CN/LC_MESSAGES/bridgedb.po | 90 --- 1 file

[tor-commits] [translation/exoneratorproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties_completed

2019-10-22 Thread translation
commit 0b4a4818e81b0e0bff798ad904b945b4999f3299 Author: Translation commit bot Date: Wed Oct 23 00:46:00 2019 + https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties_completed --- zh_CN/exonerator.properties | 1 + 1 file changed, 1 insertion(+) diff --git

[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb

2019-10-22 Thread translation
commit 547db12c7ca1fe71672ad1283feb4908f14e7a75 Author: Translation commit bot Date: Wed Oct 23 00:45:15 2019 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- zh_CN/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

[tor-commits] [translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed

2019-10-22 Thread translation
commit e1c6a3dc550ea4aa5f4007f989762076aeb563e7 Author: Translation commit bot Date: Wed Oct 23 00:23:16 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed --- zh_CN/network-settings.dtd | 16 1 file changed, 8

[tor-commits] [translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed

2019-10-22 Thread translation
commit ce78c0715a596a7dd7328ea62ce9b5bb6d7399ac Author: Translation commit bot Date: Wed Oct 23 00:17:15 2019 + https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed --- zh_CN/messages.json | 32 1 file

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

2019-10-22 Thread teor
commit a822bf291e258818fdc4ce94059b105cd733a3ee Merge: 53c4068e8 65545e134 Author: teor Date: Wed Oct 23 10:00:45 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.2] Authorities reject relays running unsupported Tor release series.

2019-10-22 Thread teor
commit f3c0a0b9fe2791571dd483ac28a73fc4776169a8 Author: Nick Mathewson Date: Thu Aug 29 11:43:43 2019 -0400 Authorities reject relays running unsupported Tor release series. Our minimum version is now 0.2.9.5-alpha. Series 0.3.0, 0.3.1, 0.3.2, 0.3.3, and 0.3.4 are now

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

2019-10-22 Thread teor
commit e188e02f28b3732c6788e4136685dcec4caa027d Merge: fd4fca378 8bc65cda4 Author: teor Date: Wed Oct 23 10:00:41 2019 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 changes/ticket31549 | 4 +++ src/feature/dirauth/process_descs.c | 59

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

2019-10-22 Thread teor
commit 65545e13452bf042087bc99e7a998427941eee79 Merge: b45048fea 8bc65cda4 Author: teor Date: Wed Oct 23 09:59:07 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 `git merge --strategy ours` to use STATIC for unit tests in maint-0.4.2.

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

2019-10-22 Thread teor
commit 8bc65cda4423d27896dcf3060cbe4d6abcdd3438 Merge: 4a5c909ce f3c0a0b9f Author: teor Date: Wed Oct 23 09:58:22 2019 +1000 Merge branch 'pr1450_squashed' into maint-0.4.1 changes/ticket31549 | 4 +++ src/feature/dirauth/process_descs.c | 59

[tor-commits] [tor/release-0.4.1] Authorities reject relays running unsupported Tor release series.

2019-10-22 Thread teor
commit f3c0a0b9fe2791571dd483ac28a73fc4776169a8 Author: Nick Mathewson Date: Thu Aug 29 11:43:43 2019 -0400 Authorities reject relays running unsupported Tor release series. Our minimum version is now 0.2.9.5-alpha. Series 0.3.0, 0.3.1, 0.3.2, 0.3.3, and 0.3.4 are now

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

2019-10-22 Thread teor
commit 8bc65cda4423d27896dcf3060cbe4d6abcdd3438 Merge: 4a5c909ce f3c0a0b9f Author: teor Date: Wed Oct 23 09:58:22 2019 +1000 Merge branch 'pr1450_squashed' into maint-0.4.1 changes/ticket31549 | 4 +++ src/feature/dirauth/process_descs.c | 59

[tor-commits] [tor/maint-0.4.1] Authorities reject relays running unsupported Tor release series.

2019-10-22 Thread teor
commit f3c0a0b9fe2791571dd483ac28a73fc4776169a8 Author: Nick Mathewson Date: Thu Aug 29 11:43:43 2019 -0400 Authorities reject relays running unsupported Tor release series. Our minimum version is now 0.2.9.5-alpha. Series 0.3.0, 0.3.1, 0.3.2, 0.3.3, and 0.3.4 are now

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

2019-10-22 Thread teor
commit 65545e13452bf042087bc99e7a998427941eee79 Merge: b45048fea 8bc65cda4 Author: teor Date: Wed Oct 23 09:59:07 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 `git merge --strategy ours` to use STATIC for unit tests in maint-0.4.2.

[tor-commits] [tor/maint-0.4.2] Authorities reject relays running unsupported Tor release series.

2019-10-22 Thread teor
commit f3c0a0b9fe2791571dd483ac28a73fc4776169a8 Author: Nick Mathewson Date: Thu Aug 29 11:43:43 2019 -0400 Authorities reject relays running unsupported Tor release series. Our minimum version is now 0.2.9.5-alpha. Series 0.3.0, 0.3.1, 0.3.2, 0.3.3, and 0.3.4 are now

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

2019-10-22 Thread teor
commit 8bc65cda4423d27896dcf3060cbe4d6abcdd3438 Merge: 4a5c909ce f3c0a0b9f Author: teor Date: Wed Oct 23 09:58:22 2019 +1000 Merge branch 'pr1450_squashed' into maint-0.4.1 changes/ticket31549 | 4 +++ src/feature/dirauth/process_descs.c | 59

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

2019-10-22 Thread teor
commit 8bc65cda4423d27896dcf3060cbe4d6abcdd3438 Merge: 4a5c909ce f3c0a0b9f Author: teor Date: Wed Oct 23 09:58:22 2019 +1000 Merge branch 'pr1450_squashed' into maint-0.4.1 changes/ticket31549 | 4 +++ src/feature/dirauth/process_descs.c | 59

[tor-commits] [tor/master] Authorities reject relays running unsupported Tor release series.

2019-10-22 Thread teor
commit f3c0a0b9fe2791571dd483ac28a73fc4776169a8 Author: Nick Mathewson Date: Thu Aug 29 11:43:43 2019 -0400 Authorities reject relays running unsupported Tor release series. Our minimum version is now 0.2.9.5-alpha. Series 0.3.0, 0.3.1, 0.3.2, 0.3.3, and 0.3.4 are now

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

2019-10-22 Thread teor
commit 65545e13452bf042087bc99e7a998427941eee79 Merge: b45048fea 8bc65cda4 Author: teor Date: Wed Oct 23 09:59:07 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 `git merge --strategy ours` to use STATIC for unit tests in maint-0.4.2.

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

2019-10-22 Thread teor
commit 8bc65cda4423d27896dcf3060cbe4d6abcdd3438 Merge: 4a5c909ce f3c0a0b9f Author: teor Date: Wed Oct 23 09:58:22 2019 +1000 Merge branch 'pr1450_squashed' into maint-0.4.1 changes/ticket31549 | 4 +++ src/feature/dirauth/process_descs.c | 59

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

2019-10-22 Thread teor
commit 8a56819d2375337027f11073947090224f15993b Merge: 9db1602ec 65545e134 Author: teor Date: Wed Oct 23 10:00:49 2019 +1000 Merge branch 'maint-0.4.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.3.5] Try using make -k in Travis configuration

2019-10-22 Thread teor
commit 6ed3d8dbd180aa72e2c9b3fa4835fb82e0f60556 Author: Nick Mathewson Date: Mon Sep 23 15:04:54 2019 -0400 Try using make -k in Travis configuration Frequently, when a patch fails, it has failures in several files. Using the "-k" flag will let us learn all the compilation

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

2019-10-22 Thread teor
commit da5c8277eacc3a18234373228da1397f36112e19 Merge: 49a11f8a8 6ed3d8dbd Author: Nick Mathewson Date: Tue Sep 24 08:01:43 2019 -0400 Merge branch 'ticket31372_029' into ticket31372_035 .travis.yml| 6 -- changes/ticket31372_travis | 4 2 files changed, 8

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

2019-10-22 Thread teor
commit 1ea19d7a5bf538f5b9f0988c2375966f88d87867 Merge: 21c3488af 7660a7cf7 Author: teor Date: Wed Oct 23 08:24:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 `git merge --strategy ours` to take the 0.3.5 changes for 31001, and ignore the conflicting 0.2.9 changes.

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

2019-10-22 Thread teor
commit 7660a7cf7d4191e44aba0bf3e02a001d7e979d29 Merge: 511aeba8e 97d73db7c Author: teor Date: Wed Oct 23 08:20:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9 changes/ticket31001 | 6 ++ src/common/compat.c | 8 2 files changed, 10

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

2019-10-22 Thread teor
commit 53c4068e80e20e0e7d57639108bb1bf4ad1bc983 Merge: 443df7e0d b45048fea Author: teor Date: Wed Oct 23 08:47:27 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug32106 | 5 + doc/tor.1.txt| 21 + 2 files changed, 18 insertions(+), 8

[tor-commits] [tpo/master] Bug 32201: Add the mk locale for Tor Browser stable downloads

2019-10-22 Thread boklm
commit dd9e5bffce077c57a00ebcf78b1e0a029bc98f48 Author: Nicolas Vigier Date: Wed Oct 23 00:50:42 2019 +0200 Bug 32201: Add the mk locale for Tor Browser stable downloads --- databags/download-alternatives.ini | 4 1 file changed, 4 insertions(+) diff --git

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

2019-10-22 Thread teor
commit 003be727c4a88c04424cb13429cf36f887e92f5c Merge: 1ea19d7a5 41bc1fac8 Author: teor Date: Wed Oct 23 08:28:03 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5 changes/bug23507 | 5 + changes/bug23818_v2| 6 ++

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

2019-10-22 Thread teor
commit 4a5c909ce5e91e916620de4b8dde28d42b4d4d8e Merge: 3c071f300 57acdaa3f Author: teor Date: Wed Oct 23 08:47:15 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .appveyor.yml| 6 +++--- .travis.yml | 6 -- changes/ticket31372_appveyor | 4

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

2019-10-22 Thread teor
commit 57acdaa3f14db52efb5e9ae2be3e54ddbf17bad9 Merge: 641f13044 d175e7081 Author: teor Date: Wed Oct 23 08:47:08 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug12399 | 3 +++ changes/bug23507 | 5 + changes/bug23818_v2| 6

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

2019-10-22 Thread teor
commit 27965f1ef2ff44e2ce7e3f1af72f9112fb30bde5 Merge: 003be727c 05fa1689e Author: teor Date: Wed Oct 23 08:30:48 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5 changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5

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

2019-10-22 Thread teor
commit b45048feaf0db75108333f86e0d70e08e8a90382 Merge: 80a198928 4a5c909ce Author: teor Date: Wed Oct 23 08:47:23 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-10-22 Thread teor
commit 641f1304475402c975ede04b11e9be7c8675411b Merge: 4013e50cb 246fdd874 Author: teor Date: Wed Oct 23 08:35:17 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0 .appveyor.yml| 6 +++--- .travis.yml | 6 --

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

2019-10-22 Thread teor
commit d175e70817ccff01cd9eb73d8da9e306745fb469 Merge: c77162e4e 8682442c7 Author: teor Date: Wed Oct 23 08:47:01 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.2.9] Prevent UB on signed overflow.

2019-10-22 Thread teor
commit 0d4a689d3ae8f7e05b3baf8ad71d983a767ef55b Author: Tobias Stoeckmann Date: Mon Jun 24 22:08:49 2019 +0200 Prevent UB on signed overflow. Overflowing a signed integer in C is an undefined behaviour. It is possible to trigger this undefined behaviour in tor_asprintf on

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

2019-10-22 Thread teor
commit 7660a7cf7d4191e44aba0bf3e02a001d7e979d29 Merge: 511aeba8e 97d73db7c Author: teor Date: Wed Oct 23 08:20:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9 changes/ticket31001 | 6 ++ src/common/compat.c | 8 2 files changed, 10

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

2019-10-22 Thread teor
commit 003be727c4a88c04424cb13429cf36f887e92f5c Merge: 1ea19d7a5 41bc1fac8 Author: teor Date: Wed Oct 23 08:28:03 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5 changes/bug23507 | 5 + changes/bug23818_v2| 6 ++

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

2019-10-22 Thread teor
commit 8682442c7629c2ede5198a00ab1cf8f4e21991d6 Merge: 7660a7cf7 6ed3d8dbd Author: teor Date: Wed Oct 23 08:32:22 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9 .travis.yml| 6 -- changes/ticket31372_travis | 4 2 files changed, 8

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

2019-10-22 Thread teor
commit 27965f1ef2ff44e2ce7e3f1af72f9112fb30bde5 Merge: 003be727c 05fa1689e Author: teor Date: Wed Oct 23 08:30:48 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5 changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5

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

2019-10-22 Thread teor
commit 246fdd87424e8e1345aba20ac5d22c07ce082da4 Merge: 9e674d0eb da5c8277e Author: Nick Mathewson Date: Tue Sep 24 08:02:44 2019 -0400 Merge branch 'ticket31372_035' into ticket31372_040 .appveyor.yml| 6 +++--- .travis.yml | 6 --

[tor-commits] [tor/release-0.4.2] Prevent UB on signed overflow.

2019-10-22 Thread teor
commit 0d4a689d3ae8f7e05b3baf8ad71d983a767ef55b Author: Tobias Stoeckmann Date: Mon Jun 24 22:08:49 2019 +0200 Prevent UB on signed overflow. Overflowing a signed integer in C is an undefined behaviour. It is possible to trigger this undefined behaviour in tor_asprintf on

[tor-commits] [tor/release-0.4.2] Changes file for bug 31001

2019-10-22 Thread teor
commit 97d73db7c36ec3fac2974726012f76bff63f9dfc Author: Nick Mathewson Date: Fri Jul 19 09:21:08 2019 -0400 Changes file for bug 31001 --- changes/ticket31001 | 6 ++ 1 file changed, 6 insertions(+) diff --git a/changes/ticket31001 b/changes/ticket31001 new file mode 100644 index

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

2019-10-22 Thread teor
commit c77162e4e95fdfd6a5cc422802dee943750b14b7 Merge: 27965f1ef da5c8277e Author: teor Date: Wed Oct 23 08:32:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5 .appveyor.yml| 6 +++--- .travis.yml | 6 --

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

2019-10-22 Thread teor
commit 1ea19d7a5bf538f5b9f0988c2375966f88d87867 Merge: 21c3488af 7660a7cf7 Author: teor Date: Wed Oct 23 08:24:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 `git merge --strategy ours` to take the 0.3.5 changes for 31001, and ignore the conflicting 0.2.9 changes.

[tor-commits] [tor/maint-0.4.0] hs: Always use a 3-hop path when a v3 single onion rend fails

2019-10-22 Thread teor
commit c94904b35982a73a652d9bed8b195ce625bbb962 Author: teor Date: Fri Aug 23 14:41:24 2019 +1000 hs: Always use a 3-hop path when a v3 single onion rend fails Previously, we used a 1-hop path when a single onion rend failed immediately, and a 3-hop path when it failed after

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

2019-10-22 Thread teor
commit c77162e4e95fdfd6a5cc422802dee943750b14b7 Merge: 27965f1ef da5c8277e Author: teor Date: Wed Oct 23 08:32:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5 .appveyor.yml| 6 +++--- .travis.yml | 6 --

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

2019-10-22 Thread teor
commit 1ea19d7a5bf538f5b9f0988c2375966f88d87867 Merge: 21c3488af 7660a7cf7 Author: teor Date: Wed Oct 23 08:24:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 `git merge --strategy ours` to take the 0.3.5 changes for 31001, and ignore the conflicting 0.2.9 changes.

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

2019-10-22 Thread teor
commit 27965f1ef2ff44e2ce7e3f1af72f9112fb30bde5 Merge: 003be727c 05fa1689e Author: teor Date: Wed Oct 23 08:30:48 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5 changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5

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

2019-10-22 Thread teor
commit 1ea19d7a5bf538f5b9f0988c2375966f88d87867 Merge: 21c3488af 7660a7cf7 Author: teor Date: Wed Oct 23 08:24:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 `git merge --strategy ours` to take the 0.3.5 changes for 31001, and ignore the conflicting 0.2.9 changes.

[tor-commits] [tor/release-0.4.2] clarify in man page: we count by powers of two

2019-10-22 Thread teor
commit 4233fb7014b0ef5a6830f36608e1779299e07cd8 Author: Roger Dingledine Date: Wed Oct 16 06:13:14 2019 -0400 clarify in man page: we count by powers of two Make clear in the man page, in both the bandwidth section and the accountingmax section, that Tor counts in powers of

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

2019-10-22 Thread teor
commit c77162e4e95fdfd6a5cc422802dee943750b14b7 Merge: 27965f1ef da5c8277e Author: teor Date: Wed Oct 23 08:32:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5 .appveyor.yml| 6 +++--- .travis.yml | 6 --

[tor-commits] [tor/release-0.4.2] Remove outdated note.

2019-10-22 Thread teor
commit 80a198928e14f5932f283206541124209df95fb7 Author: Philipp Winter Date: Thu Sep 19 12:42:44 2019 -0700 Remove outdated note. BridgeDB supports bridge-distribution lines since version 0.5.0: --- doc/tor.1.txt | 4 1 file changed, 4

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

2019-10-22 Thread teor
commit 7660a7cf7d4191e44aba0bf3e02a001d7e979d29 Merge: 511aeba8e 97d73db7c Author: teor Date: Wed Oct 23 08:20:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9 changes/ticket31001 | 6 ++ src/common/compat.c | 8 2 files changed, 10

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

2019-10-22 Thread teor
commit d175e70817ccff01cd9eb73d8da9e306745fb469 Merge: c77162e4e 8682442c7 Author: teor Date: Wed Oct 23 08:47:01 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-10-22 Thread teor
commit 8682442c7629c2ede5198a00ab1cf8f4e21991d6 Merge: 7660a7cf7 6ed3d8dbd Author: teor Date: Wed Oct 23 08:32:22 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9 .travis.yml| 6 -- changes/ticket31372_travis | 4 2 files changed, 8

[tor-commits] [tor/release-0.4.1] Try using make -k in Travis configuration

2019-10-22 Thread teor
commit 6ed3d8dbd180aa72e2c9b3fa4835fb82e0f60556 Author: Nick Mathewson Date: Mon Sep 23 15:04:54 2019 -0400 Try using make -k in Travis configuration Frequently, when a patch fails, it has failures in several files. Using the "-k" flag will let us learn all the compilation

[tor-commits] [tor/release-0.4.1] Prevent UB on signed overflow.

2019-10-22 Thread teor
commit 0d4a689d3ae8f7e05b3baf8ad71d983a767ef55b Author: Tobias Stoeckmann Date: Mon Jun 24 22:08:49 2019 +0200 Prevent UB on signed overflow. Overflowing a signed integer in C is an undefined behaviour. It is possible to trigger this undefined behaviour in tor_asprintf on

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

2019-10-22 Thread teor
commit d4d189964aa81fe033dd8910bbf73b132d5c7da5 Merge: 2da3e3f70 57acdaa3f Author: teor Date: Wed Oct 23 08:47:12 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 .appveyor.yml | 6 +++--- .travis.yml| 6 -- changes/bug12399

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

2019-10-22 Thread teor
commit 7660a7cf7d4191e44aba0bf3e02a001d7e979d29 Merge: 511aeba8e 97d73db7c Author: teor Date: Wed Oct 23 08:20:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9 changes/ticket31001 | 6 ++ src/common/compat.c | 8 2 files changed, 10

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

2019-10-22 Thread teor
commit 641f1304475402c975ede04b11e9be7c8675411b Merge: 4013e50cb 246fdd874 Author: teor Date: Wed Oct 23 08:35:17 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0 .appveyor.yml| 6 +++--- .travis.yml | 6 --

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

2019-10-22 Thread teor
commit 57acdaa3f14db52efb5e9ae2be3e54ddbf17bad9 Merge: 641f13044 d175e7081 Author: teor Date: Wed Oct 23 08:47:08 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug12399 | 3 +++ changes/bug23507 | 5 + changes/bug23818_v2| 6

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

2019-10-22 Thread teor
commit d175e70817ccff01cd9eb73d8da9e306745fb469 Merge: c77162e4e 8682442c7 Author: teor Date: Wed Oct 23 08:47:01 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-10-22 Thread teor
commit fd4fca378ceaf202f1b8fa6c0440a0bb4f716609 Merge: 0d88b9e8a 4a5c909ce Author: teor Date: Wed Oct 23 08:47:20 2019 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 .appveyor.yml| 6 +++--- .travis.yml | 6 -- changes/ticket31372_appveyor | 4

[tor-commits] [tor/release-0.4.1] Changes file for bug 31001

2019-10-22 Thread teor
commit 97d73db7c36ec3fac2974726012f76bff63f9dfc Author: Nick Mathewson Date: Fri Jul 19 09:21:08 2019 -0400 Changes file for bug 31001 --- changes/ticket31001 | 6 ++ 1 file changed, 6 insertions(+) diff --git a/changes/ticket31001 b/changes/ticket31001 new file mode 100644 index

[tor-commits] [tor/release-0.4.1] Try using make -k in the Appveyor configuration

2019-10-22 Thread teor
commit 49a11f8a8a61a4d8b8657a98291862ffc96e99d9 Author: Nick Mathewson Date: Mon Sep 23 15:04:54 2019 -0400 Try using make -k in the Appveyor configuration Frequently, when a patch fails, it has failures in several files. Using the "-k" flag will let us learn all the

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

2019-10-22 Thread teor
commit 641f1304475402c975ede04b11e9be7c8675411b Merge: 4013e50cb 246fdd874 Author: teor Date: Wed Oct 23 08:35:17 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0 .appveyor.yml| 6 +++--- .travis.yml | 6 --

[tor-commits] [tor/release-0.4.0] Change loglevel of message 'Hash of session info was not as expected'

2019-10-22 Thread teor
commit 05fa1689eb96a1249030e1d51828a308d19d728c Author: rl1987 Date: Sat Jul 20 18:28:07 2019 +0300 Change loglevel of message 'Hash of session info was not as expected' --- changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5 insertions(+), 1

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

2019-10-22 Thread teor
commit 8682442c7629c2ede5198a00ab1cf8f4e21991d6 Merge: 7660a7cf7 6ed3d8dbd Author: teor Date: Wed Oct 23 08:32:22 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9 .travis.yml| 6 -- changes/ticket31372_travis | 4 2 files changed, 8

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

2019-10-22 Thread teor
commit 4a5c909ce5e91e916620de4b8dde28d42b4d4d8e Merge: 3c071f300 57acdaa3f Author: teor Date: Wed Oct 23 08:47:15 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .appveyor.yml| 6 +++--- .travis.yml | 6 -- changes/ticket31372_appveyor | 4

[tor-commits] [tor/release-0.4.0] Try using make -k in the Appveyor configuration

2019-10-22 Thread teor
commit 49a11f8a8a61a4d8b8657a98291862ffc96e99d9 Author: Nick Mathewson Date: Mon Sep 23 15:04:54 2019 -0400 Try using make -k in the Appveyor configuration Frequently, when a patch fails, it has failures in several files. Using the "-k" flag will let us learn all the

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

2019-10-22 Thread teor
commit c77162e4e95fdfd6a5cc422802dee943750b14b7 Merge: 27965f1ef da5c8277e Author: teor Date: Wed Oct 23 08:32:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5 .appveyor.yml| 6 +++--- .travis.yml | 6 --

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

2019-10-22 Thread teor
commit da5c8277eacc3a18234373228da1397f36112e19 Merge: 49a11f8a8 6ed3d8dbd Author: Nick Mathewson Date: Tue Sep 24 08:01:43 2019 -0400 Merge branch 'ticket31372_029' into ticket31372_035 .travis.yml| 6 -- changes/ticket31372_travis | 4 2 files changed, 8

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

2019-10-22 Thread teor
commit 8682442c7629c2ede5198a00ab1cf8f4e21991d6 Merge: 7660a7cf7 6ed3d8dbd Author: teor Date: Wed Oct 23 08:32:22 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9 .travis.yml| 6 -- changes/ticket31372_travis | 4 2 files changed, 8

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

2019-10-22 Thread teor
commit 246fdd87424e8e1345aba20ac5d22c07ce082da4 Merge: 9e674d0eb da5c8277e Author: Nick Mathewson Date: Tue Sep 24 08:02:44 2019 -0400 Merge branch 'ticket31372_035' into ticket31372_040 .appveyor.yml| 6 +++--- .travis.yml | 6 --

[tor-commits] [tor/release-0.4.0] Try using make -k in Travis configuration

2019-10-22 Thread teor
commit 6ed3d8dbd180aa72e2c9b3fa4835fb82e0f60556 Author: Nick Mathewson Date: Mon Sep 23 15:04:54 2019 -0400 Try using make -k in Travis configuration Frequently, when a patch fails, it has failures in several files. Using the "-k" flag will let us learn all the compilation

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

2019-10-22 Thread teor
commit 57acdaa3f14db52efb5e9ae2be3e54ddbf17bad9 Merge: 641f13044 d175e7081 Author: teor Date: Wed Oct 23 08:47:08 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug12399 | 3 +++ changes/bug23507 | 5 + changes/bug23818_v2| 6

[tor-commits] [tor/release-0.4.0] rendservice: Always use a 3-hop path when a v2 single onion rend fails

2019-10-22 Thread teor
commit dc08f8ac70e95b9a76f86a5e15dfcabd7ada25b9 Author: teor Date: Fri Aug 23 14:38:54 2019 +1000 rendservice: Always use a 3-hop path when a v2 single onion rend fails Previously, we used a 1-hop path when a single onion rend failed immediately, and a 3-hop path when it

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

2019-10-22 Thread teor
commit 8682442c7629c2ede5198a00ab1cf8f4e21991d6 Merge: 7660a7cf7 6ed3d8dbd Author: teor Date: Wed Oct 23 08:32:22 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9 .travis.yml| 6 -- changes/ticket31372_travis | 4 2 files changed, 8

[tor-commits] [tor/release-0.4.0] Prevent UB on signed overflow.

2019-10-22 Thread teor
commit 0d4a689d3ae8f7e05b3baf8ad71d983a767ef55b Author: Tobias Stoeckmann Date: Mon Jun 24 22:08:49 2019 +0200 Prevent UB on signed overflow. Overflowing a signed integer in C is an undefined behaviour. It is possible to trigger this undefined behaviour in tor_asprintf on

[tor-commits] [tor/release-0.4.0] hs: v3 single onion services fall back to 3-hop intro for unreachable nodes

2019-10-22 Thread teor
commit e2e1c07fd25c96a83b38f5d84d2c063b98ed8f46 Author: teor Date: Fri Aug 23 16:17:47 2019 +1000 hs: v3 single onion services fall back to 3-hop intro for unreachable nodes Previously, v3 single onion services failed when all intro nodes were unreachable via a 1-hop path.

[tor-commits] [tor/release-0.4.0] hs: Always use a 3-hop path when a v3 single onion intro fails

2019-10-22 Thread teor
commit 229a982405e0fd2f9980d3c1a41c34e0cf26ae26 Author: teor Date: Fri Aug 23 14:56:01 2019 +1000 hs: Always use a 3-hop path when a v3 single onion intro fails Previously, we always used a 1-hop path, no matter how many times a v3 single onion intro failed. Fixes bug

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

2019-10-22 Thread teor
commit d175e70817ccff01cd9eb73d8da9e306745fb469 Merge: c77162e4e 8682442c7 Author: teor Date: Wed Oct 23 08:47:01 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-10-22 Thread teor
commit 003be727c4a88c04424cb13429cf36f887e92f5c Merge: 1ea19d7a5 41bc1fac8 Author: teor Date: Wed Oct 23 08:28:03 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5 changes/bug23507 | 5 + changes/bug23818_v2| 6 ++

[tor-commits] [tor/release-0.4.0] changes: file for 23818, v2 onion service fix

2019-10-22 Thread teor
commit 231a74363fa9ccd1769b61229dc70a72e1e5807b Author: teor Date: Fri Aug 23 15:08:43 2019 +1000 changes: file for 23818, v2 onion service fix --- changes/bug23818_v2 | 6 ++ 1 file changed, 6 insertions(+) diff --git a/changes/bug23818_v2 b/changes/bug23818_v2 new file mode 100644

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

2019-10-22 Thread teor
commit 4961a0ae9018ba395d3fbee0a38763deeb1a98da Merge: 3209b4f77 d175e7081 Author: teor Date: Wed Oct 23 08:47:05 2019 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 .appveyor.yml | 6 +++--- .travis.yml| 6 -- changes/bug12399

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

2019-10-22 Thread teor
commit c77162e4e95fdfd6a5cc422802dee943750b14b7 Merge: 27965f1ef da5c8277e Author: teor Date: Wed Oct 23 08:32:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5 .appveyor.yml| 6 +++--- .travis.yml | 6 --

[tor-commits] [tor/release-0.4.0] Changes file for bug 31001

2019-10-22 Thread teor
commit 97d73db7c36ec3fac2974726012f76bff63f9dfc Author: Nick Mathewson Date: Fri Jul 19 09:21:08 2019 -0400 Changes file for bug 31001 --- changes/ticket31001 | 6 ++ 1 file changed, 6 insertions(+) diff --git a/changes/ticket31001 b/changes/ticket31001 new file mode 100644 index

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

2019-10-22 Thread teor
commit 27965f1ef2ff44e2ce7e3f1af72f9112fb30bde5 Merge: 003be727c 05fa1689e Author: teor Date: Wed Oct 23 08:30:48 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5 changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5

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

2019-10-22 Thread teor
commit 27965f1ef2ff44e2ce7e3f1af72f9112fb30bde5 Merge: 003be727c 05fa1689e Author: teor Date: Wed Oct 23 08:30:48 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5 changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5

[tor-commits] [tor/release-0.4.0] rendservice: Always use a 3-hop path when a v2 single onion intro fails

2019-10-22 Thread teor
commit 144084d6facc3d688c7d423a8b5b8da5e26de84c Author: teor Date: Fri Aug 23 14:54:15 2019 +1000 rendservice: Always use a 3-hop path when a v2 single onion intro fails Previously, we always used a 1-hop path, no matter how many times a v2 single onion intro failed.

[tor-commits] [tor/release-0.4.0] changes: file for 23818, v3 onion service fix

2019-10-22 Thread teor
commit 084245134b022aa983c45aa3fc0ace9fd7ae21a9 Author: teor Date: Fri Aug 23 15:10:45 2019 +1000 changes: file for 23818, v3 onion service fix --- changes/bug23818_v3 | 6 ++ 1 file changed, 6 insertions(+) diff --git a/changes/bug23818_v3 b/changes/bug23818_v3 new file mode 100644

[tor-commits] [tor/release-0.4.0] changes: file for 23507, v3 onion service fix

2019-10-22 Thread teor
commit 41bc1fac8e77e399572e020c5ba59462afd75f4b Author: teor Date: Fri Aug 23 16:25:33 2019 +1000 changes: file for 23507, v3 onion service fix --- changes/bug23507 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/bug23507 b/changes/bug23507 new file mode 100644 index

[tor-commits] [tor/release-0.3.5] hs: Always use a 3-hop path when a v3 single onion rend fails

2019-10-22 Thread teor
commit c94904b35982a73a652d9bed8b195ce625bbb962 Author: teor Date: Fri Aug 23 14:41:24 2019 +1000 hs: Always use a 3-hop path when a v3 single onion rend fails Previously, we used a 1-hop path when a single onion rend failed immediately, and a 3-hop path when it failed after

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

2019-10-22 Thread teor
commit 003be727c4a88c04424cb13429cf36f887e92f5c Merge: 1ea19d7a5 41bc1fac8 Author: teor Date: Wed Oct 23 08:28:03 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5 changes/bug23507 | 5 + changes/bug23818_v2| 6 ++

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

2019-10-22 Thread teor
commit 1ea19d7a5bf538f5b9f0988c2375966f88d87867 Merge: 21c3488af 7660a7cf7 Author: teor Date: Wed Oct 23 08:24:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 `git merge --strategy ours` to take the 0.3.5 changes for 31001, and ignore the conflicting 0.2.9 changes.

[tor-commits] [tor/release-0.3.5] hs: v3 single onion services fall back to 3-hop intro for unreachable nodes

2019-10-22 Thread teor
commit e2e1c07fd25c96a83b38f5d84d2c063b98ed8f46 Author: teor Date: Fri Aug 23 16:17:47 2019 +1000 hs: v3 single onion services fall back to 3-hop intro for unreachable nodes Previously, v3 single onion services failed when all intro nodes were unreachable via a 1-hop path.

[tor-commits] [tor/release-0.3.5] hs: Always use a 3-hop path when a v3 single onion intro fails

2019-10-22 Thread teor
commit 229a982405e0fd2f9980d3c1a41c34e0cf26ae26 Author: teor Date: Fri Aug 23 14:56:01 2019 +1000 hs: Always use a 3-hop path when a v3 single onion intro fails Previously, we always used a 1-hop path, no matter how many times a v3 single onion intro failed. Fixes bug

  1   2   3   4   5   6   >