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

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 insert

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

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/master] Merge branch 'maint-0.2.9' into maint-0.3.5

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 https://list

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

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 in

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

commit 9db1602ec53aa74332c6faff40354a2b1c7f074d Merge: 339c18d6c b45048fea Author: teor Date: Wed Oct 23 08:47:30 2019 +1000 Merge branch 'maint-0.4.2' changes/bug32106 | 5 + doc/tor.1.txt| 21 + 2 files changed, 18 insertions(+), 8 deletions(-)

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

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 -- changes/ticket3

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

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 W

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

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 ++ changes/bu

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

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 insertions(

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

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 -- changes/ticket3

[tor-commits] [tor/master] Tidy whitespace around some STMT_BEGINs and STMT_ENDs

commit 339c18d6c745208b939d3db08f7cd0f2a6504d7c Author: teor Date: Wed Oct 23 07:37:39 2019 +1000 Tidy whitespace around some STMT_BEGINs and STMT_ENDs --- src/app/config/config.c| 3 ++- src/feature/nodelist/node_select.c | 2 +- src/test/test_dir.c| 1 - src/t

[tor-commits] [tor/master] Remove outdated note.

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/master] clarify in man page: we count by powers of two

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 two

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

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/master] Merge branch 'maint-0.3.5' into maint-0.4.0

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/master] Changes file for bug 31001

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] [translation/liveusb-creator] https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator

commit 2b8c3d896a5c2b06a93c0967d113b58d63311613 Author: Translation commit bot Date: Tue Oct 22 21:46:20 2019 + https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator --- nl/nl.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nl/nl.po b/nl

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

commit 56fdcb4dbe5744ec485675ad98bcb3029b534771 Author: Translation commit bot Date: Tue Oct 22 21:45:43 2019 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot --- locale/nl/LC_MESSAGES/messages.po | 17 + 1 file changed, 9 insertions(+)

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

commit 9703db1e9ff1cfa19868668dfad295e84947cbc3 Author: Translation commit bot Date: Tue Oct 22 21:23:10 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+nl.po | 89 ++ 1 file changed, 46 inserti

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

commit 37709d5900b1ec853e1c89442bfa8ed18e03b84d Author: Translation commit bot Date: Tue Oct 22 21:22:26 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torcheck --- nl/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nl/torcheck.po b

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

commit 59b0499de9b84a136ec65d47ced0d6614111224b Author: Translation commit bot Date: Tue Oct 22 21:21:52 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd --- nl/abouttbupdate.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [dip/master] Upgrade to 12.3.2

commit 46a4f25f99103771239097451d86815e681ac549 Author: Bastian Blank Date: Mon Sep 30 21:43:17 2019 +0200 Upgrade to 12.3.2 --- playbooks/group_vars/all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all.yml

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

commit c0c9b85952153d5f886bcc1e290a82f7f54634a8 Author: Translation commit bot Date: Tue Oct 22 21:16:47 2019 + https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot --- code_of_conduct+he.po | 12 ++-- 1 file changed, 6 insertions(+), 6 deleti

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

commit 2ed194c9a93c9e60ca4d4ff0bbf25acb2cf2c62c Merge: edc3f7063 a7ccd9a99 Author: Nick Mathewson Date: Tue Oct 22 14:46:10 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2 changes/bug32108 | 8 src/core/mainloop/mainloop.c | 2 +- 2 files

[tor-commits] [tor/release-0.4.2] respect accountingmax during soft hibernation

commit a7ccd9a997bc85c0e03926b7d24f7e05a4a51d39 Author: Roger Dingledine Date: Mon Oct 21 04:14:42 2019 -0400 respect accountingmax during soft hibernation Relays now respect their AccountingMax bandwidth again. When relays entered "soft" hibernation (which typically starts whe

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

commit 2ed194c9a93c9e60ca4d4ff0bbf25acb2cf2c62c Merge: edc3f7063 a7ccd9a99 Author: Nick Mathewson Date: Tue Oct 22 14:46:10 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2 changes/bug32108 | 8 src/core/mainloop/mainloop.c | 2 +- 2 files

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

commit 1cdc030c3d3afbe16461271a1147397f87ba5693 Merge: 91413e04b 2ed194c9a Author: Nick Mathewson Date: Tue Oct 22 14:47:28 2019 -0400 Merge branch 'maint-0.4.2' changes/bug32108 | 8 src/core/mainloop/mainloop.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

[tor-commits] [tor/maint-0.4.2] respect accountingmax during soft hibernation

commit a7ccd9a997bc85c0e03926b7d24f7e05a4a51d39 Author: Roger Dingledine Date: Mon Oct 21 04:14:42 2019 -0400 respect accountingmax during soft hibernation Relays now respect their AccountingMax bandwidth again. When relays entered "soft" hibernation (which typically starts whe

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

commit 443df7e0d25710036c4cc821954cfd92386419a3 Merge: 869e15cbf 2ed194c9a Author: Nick Mathewson Date: Tue Oct 22 14:47:28 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug32108 | 8 src/core/mainloop/mainloop.c | 2 +- 2 files changed, 9 insertion

[tor-commits] [tor/master] respect accountingmax during soft hibernation

commit a7ccd9a997bc85c0e03926b7d24f7e05a4a51d39 Author: Roger Dingledine Date: Mon Oct 21 04:14:42 2019 -0400 respect accountingmax during soft hibernation Relays now respect their AccountingMax bandwidth again. When relays entered "soft" hibernation (which typically starts whe

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

commit 2ed194c9a93c9e60ca4d4ff0bbf25acb2cf2c62c Merge: edc3f7063 a7ccd9a99 Author: Nick Mathewson Date: Tue Oct 22 14:46:10 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2 changes/bug32108 | 8 src/core/mainloop/mainloop.c | 2 +- 2 files

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

commit 3caad9ff22ad55fcd1f3de2f48e4aa003ce54aef Author: Translation commit bot Date: Tue Oct 22 17:52:55 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+fr.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents

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

commit c6091fc371f79860c04bcc540a0eced7a2c5d95b Author: Translation commit bot Date: Tue Oct 22 17:52:46 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+fr.po b/conten

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

commit 0f1e9fc9629754079a7d444a02ab43de4be43965 Author: Translation commit bot Date: Tue Oct 22 17:24:13 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+fr.po| 14 +- contents+pt-BR.po | 20 contents+pt-

[tor-commits] [tpo/master] Revert "Set Tor Browser for Android version to 8.5.6"

commit 745c55a89634a9ce35c00e46a483d7641e166810 Author: Nicolas Vigier Date: Tue Oct 22 19:21:40 2019 +0200 Revert "Set Tor Browser for Android version to 8.5.6" This reverts commit b23afc4367808fdd41f4ad584c8b210e81514941. --- databags/versions.ini | 3 --- templates/do

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

commit f4d61c28c513d2f049b7e8fd63ad831b0bcb3b34 Author: Translation commit bot Date: Tue Oct 22 17:24:02 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+am.po| 14 +- contents+ar.po| 18 +++--- contents+az.po| 14 +

[tor-commits] [tpo/master] Add new Tor Browser version: 9.0

commit 3ce5cddd3839b0eba9439514f8d4c7a81abf779a Author: Nicolas Vigier Date: Tue Oct 22 19:20:59 2019 +0200 Add new Tor Browser version: 9.0 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 databags/versions.ini | 4 ++--

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

commit 5ddc04f49d1bcb9485de5a0eb500c6e03ac5fe7e Merge: 730f0e3da d08d29f15 Author: Nick Mathewson Date: Tue Oct 22 12:53:12 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org https

[tor-commits] [tor/release-0.4.1] Extract expressions in construct_ntor_key_map()

commit 1e9488f2fd829d48eb5ef6c2170e0f7163061136 Author: Nick Mathewson Date: Wed Sep 18 11:11:05 2019 -0400 Extract expressions in construct_ntor_key_map() No behavioral change here: this is just refactoring. --- src/feature/relay/router.c | 17 +++-- 1 file changed, 7

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

commit 869e15cbf49417f2c6774bec49da9d91dc133905 Merge: fb610c9a2 edc3f7063 Author: Nick Mathewson Date: Tue Oct 22 12:54:44 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org htt

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

commit fb610c9a23b37428c6211965f600a893b02cc395 Merge: 796f1d8b7 5ddc04f49 Author: Nick Mathewson Date: Tue Oct 22 12:53:12 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org htt

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

commit 5ddc04f49d1bcb9485de5a0eb500c6e03ac5fe7e Merge: 730f0e3da d08d29f15 Author: Nick Mathewson Date: Tue Oct 22 12:53:12 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org ht

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

commit edc3f70635fdead8f4dd777117c82b7319c19fe6 Merge: 5ddc04f49 3c071f300 Author: Nick Mathewson Date: Tue Oct 22 12:54:43 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org ht

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

commit 3c071f30029adcbae795150bb7d19ad2f4734658 Merge: d08d29f15 3c97ab3c2 Author: Nick Mathewson Date: Tue Oct 22 12:54:37 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1 changes/bug31107 | 4 src/core/or/channeltls.c | 10 +- 2 files c

[tor-commits] [tor/master] Remove changes files that are already merged in 0.4.2.

commit 91413e04b458f41334ea4e25e35829043956b742 Author: Nick Mathewson Date: Tue Oct 22 13:01:25 2019 -0400 Remove changes files that are already merged in 0.4.2. --- changes/bug30344| 4 changes/bug31652| 5 - changes/bug31734| 3 --- changes/bug31810| 4 cha

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

commit 3c071f30029adcbae795150bb7d19ad2f4734658 Merge: d08d29f15 3c97ab3c2 Author: Nick Mathewson Date: Tue Oct 22 12:54:37 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1 changes/bug31107 | 4 src/core/or/channeltls.c | 10 +- 2 files c

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

commit d08d29f15f0c80b74f6440b8b84eefe241c87aad Merge: b588b6087 4bbefc2aa Author: Nick Mathewson Date: Tue Oct 22 12:53:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1 changes/bug30916 | 4 src/feature/relay/router.c | 18 -

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

commit 7c88fcf4e2ed04af07fed9438b59764f1b4adab0 Merge: 7d75e1dbd 5ddc04f49 Author: Nick Mathewson Date: Tue Oct 22 12:53:12 2019 -0400 Merge branch 'maint-0.4.2' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproje

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

commit 7664d6f518ea804e2bee942cfd15a8d4a9a724d3 Merge: e655744c8 d08d29f15 Author: Nick Mathewson Date: Tue Oct 22 12:53:12 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug30916 | 4 src/feature/relay/router.c | 18 -- 2 files changed, 1

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

commit 4bbefc2aac2d3770817200700e2a384d966bffe2 Merge: 70bcff601 2da4d64a6 Author: Nick Mathewson Date: Wed Sep 18 11:19:41 2019 -0400 Merge branch 'bug30916_035' into bug30916_041 changes/bug30916 | 4 src/feature/relay/router.c | 18 -- 2 files changed, 1

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

commit de24a7f99242c9c2e04ff54120cb9507fe41a1ec Merge: 7c88fcf4e edc3f7063 Author: Nick Mathewson Date: Tue Oct 22 12:54:44 2019 -0400 Merge branch 'maint-0.4.2' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproje

[tor-commits] [tor/master] Simplify CHECK_DEFAULT() logic a little further.

commit 4413b030f28fcbe96f1b568796b20a7e90d55301 Author: Nick Mathewson Date: Tue Oct 22 08:32:33 2019 -0400 Simplify CHECK_DEFAULT() logic a little further. Since each of these tests only applies to testing networks, put them all into a single block that checks for testing netw

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

commit 730f0e3da37bf50c7402792232d9e3196b50f2c9 Merge: 9537966a0 b588b6087 Author: Nick Mathewson Date: Tue Oct 22 12:51:33 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org ht

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

commit 0d88b9e8a99235024cc5c3e31f024fe8eb9a20c3 Merge: 7664d6f51 3c071f300 Author: Nick Mathewson Date: Tue Oct 22 12:54:43 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31107 | 4 src/core/or/channeltls.c | 10 +- 2 files changed, 13 insertions

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

commit 3c071f30029adcbae795150bb7d19ad2f4734658 Merge: d08d29f15 3c97ab3c2 Author: Nick Mathewson Date: Tue Oct 22 12:54:37 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1 changes/bug31107 | 4 src/core/or/channeltls.c | 10 +- 2 files c

[tor-commits] [tor/release-0.4.1] Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN.

commit 3c97ab3c24ba4a133377c7ec6ec89cc6903ffb2e Author: Nick Mathewson Date: Tue Sep 17 09:09:36 2019 -0400 Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN. We previously used tor_fragile_assert() to declare that this case could not happen: VERSIONS cells ar

[tor-commits] [tor/master] Make options_validate() no longer use its "defaults" argument.

commit 8d84e10e8776eab8a44a039af0c15443fba83bc6 Author: Nick Mathewson Date: Tue Oct 22 08:27:13 2019 -0400 Make options_validate() no longer use its "defaults" argument. It can just look at what the defaults are. Closes ticket 32185. --- changes/ticket32185 | 4

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

commit 5ddc04f49d1bcb9485de5a0eb500c6e03ac5fe7e Merge: 730f0e3da d08d29f15 Author: Nick Mathewson Date: Tue Oct 22 12:53:12 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org ht

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

commit d08d29f15f0c80b74f6440b8b84eefe241c87aad Merge: b588b6087 4bbefc2aa Author: Nick Mathewson Date: Tue Oct 22 12:53:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1 changes/bug30916 | 4 src/feature/relay/router.c | 18 -

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

commit 3c071f30029adcbae795150bb7d19ad2f4734658 Merge: d08d29f15 3c97ab3c2 Author: Nick Mathewson Date: Tue Oct 22 12:54:37 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1 changes/bug31107 | 4 src/core/or/channeltls.c | 10 +- 2 files c

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

commit edc3f70635fdead8f4dd777117c82b7319c19fe6 Merge: 5ddc04f49 3c071f300 Author: Nick Mathewson Date: Tue Oct 22 12:54:43 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org https

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

commit edc3f70635fdead8f4dd777117c82b7319c19fe6 Merge: 5ddc04f49 3c071f300 Author: Nick Mathewson Date: Tue Oct 22 12:54:43 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org ht

[tor-commits] [tor/maint-0.4.1] Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN.

commit 3c97ab3c24ba4a133377c7ec6ec89cc6903ffb2e Author: Nick Mathewson Date: Tue Sep 17 09:09:36 2019 -0400 Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN. We previously used tor_fragile_assert() to declare that this case could not happen: VERSIONS cells ar

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

commit 7d75e1dbdf9ab1fc0bbde086ca22a116de0216f4 Merge: 3989dd161 4413b030f Author: Nick Mathewson Date: Tue Oct 22 12:52:32 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1446' changes/ticket32185 | 4 src/app/config/config.c | 58

[tor-commits] [tor/release-0.4.1] Avoid a crash if our "current" and "old" ntor onion keys are equal

commit 2da4d64a64a803f4b0a6d56e517b4288bef6c4f8 Author: Nick Mathewson Date: Wed Sep 18 11:14:45 2019 -0400 Avoid a crash if our "current" and "old" ntor onion keys are equal Our dimap code asserts if you try to add the same key twice; this can't happen if everything is running

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

commit 3c071f30029adcbae795150bb7d19ad2f4734658 Merge: d08d29f15 3c97ab3c2 Author: Nick Mathewson Date: Tue Oct 22 12:54:37 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1 changes/bug31107 | 4 src/core/or/channeltls.c | 10 +- 2 files c

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

commit 3989dd16161d4719689b37ccf37a69975b86191c Merge: 4d43e1bf4 730f0e3da Author: Nick Mathewson Date: Tue Oct 22 12:51:33 2019 -0400 Merge branch 'maint-0.4.2' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproje

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

commit 4bbefc2aac2d3770817200700e2a384d966bffe2 Merge: 70bcff601 2da4d64a6 Author: Nick Mathewson Date: Wed Sep 18 11:19:41 2019 -0400 Merge branch 'bug30916_035' into bug30916_041 changes/bug30916 | 4 src/feature/relay/router.c | 18 -- 2 files changed, 1

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

commit d08d29f15f0c80b74f6440b8b84eefe241c87aad Merge: b588b6087 4bbefc2aa Author: Nick Mathewson Date: Tue Oct 22 12:53:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1 changes/bug30916 | 4 src/feature/relay/router.c | 18 -

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

commit d08d29f15f0c80b74f6440b8b84eefe241c87aad Merge: b588b6087 4bbefc2aa Author: Nick Mathewson Date: Tue Oct 22 12:53:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1 changes/bug30916 | 4 src/feature/relay/router.c | 18 -

[tor-commits] [tor/maint-0.4.1] Avoid a crash if our "current" and "old" ntor onion keys are equal

commit 2da4d64a64a803f4b0a6d56e517b4288bef6c4f8 Author: Nick Mathewson Date: Wed Sep 18 11:14:45 2019 -0400 Avoid a crash if our "current" and "old" ntor onion keys are equal Our dimap code asserts if you try to add the same key twice; this can't happen if everything is running

[tor-commits] [tor/maint-0.4.1] Extract expressions in construct_ntor_key_map()

commit 1e9488f2fd829d48eb5ef6c2170e0f7163061136 Author: Nick Mathewson Date: Wed Sep 18 11:11:05 2019 -0400 Extract expressions in construct_ntor_key_map() No behavioral change here: this is just refactoring. --- src/feature/relay/router.c | 17 +++-- 1 file changed, 7

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

commit d08d29f15f0c80b74f6440b8b84eefe241c87aad Merge: b588b6087 4bbefc2aa Author: Nick Mathewson Date: Tue Oct 22 12:53:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1 changes/bug30916 | 4 src/feature/relay/router.c | 18 -

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

commit 796f1d8b751ad0c05b3d763f9d8cef43cd39cac2 Merge: 24d8b931d 730f0e3da Author: Nick Mathewson Date: Tue Oct 22 12:51:33 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org htt

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

commit 730f0e3da37bf50c7402792232d9e3196b50f2c9 Merge: 9537966a0 b588b6087 Author: Nick Mathewson Date: Tue Oct 22 12:51:33 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org ht

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

commit b588b6087690b2d17fd7f854a3a1b65b569fa79c Merge: 9769df89f bf4a27c0e Author: Nick Mathewson Date: Tue Oct 22 12:51:27 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1 changes/ticket31466 | 5 + src/core/or/connection_edge.c | 6 -- 2 fi

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

commit b588b6087690b2d17fd7f854a3a1b65b569fa79c Merge: 9769df89f bf4a27c0e Author: Nick Mathewson Date: Tue Oct 22 12:51:27 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1 changes/ticket31466 | 5 + src/core/or/connection_edge.c | 6 -- 2 fi

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

commit e655744c802c30d5a7150035ce8c6f1c066f1a92 Merge: c476d30e8 b588b6087 Author: Nick Mathewson Date: Tue Oct 22 12:51:33 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/ticket31466 | 5 + src/core/or/connection_edge.c | 6 -- 2 files changed, 9 insert

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

commit b588b6087690b2d17fd7f854a3a1b65b569fa79c Merge: 9769df89f bf4a27c0e Author: Nick Mathewson Date: Tue Oct 22 12:51:27 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1 changes/ticket31466 | 5 + src/core/or/connection_edge.c | 6 -- 2 fi

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

commit b588b6087690b2d17fd7f854a3a1b65b569fa79c Merge: 9769df89f bf4a27c0e Author: Nick Mathewson Date: Tue Oct 22 12:51:27 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1 changes/ticket31466 | 5 + src/core/or/connection_edge.c | 6 -- 2 fi

[tor-commits] [tor/release-0.4.1] Add a rate-limit to our warning about the disabled .exit notation

commit f0e4120996d3a96252200ea5302dcde3af6e0bc0 Author: Nick Mathewson Date: Wed Sep 18 15:38:33 2019 -0400 Add a rate-limit to our warning about the disabled .exit notation This warning would previously be given every time we tried to open a connection to a foo.exit address, w

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

commit 730f0e3da37bf50c7402792232d9e3196b50f2c9 Merge: 9537966a0 b588b6087 Author: Nick Mathewson Date: Tue Oct 22 12:51:33 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org https

[tor-commits] [tor/maint-0.4.1] Add a rate-limit to our warning about the disabled .exit notation

commit f0e4120996d3a96252200ea5302dcde3af6e0bc0 Author: Nick Mathewson Date: Wed Sep 18 15:38:33 2019 -0400 Add a rate-limit to our warning about the disabled .exit notation This warning would previously be given every time we tried to open a connection to a foo.exit address, w

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

commit b588b6087690b2d17fd7f854a3a1b65b569fa79c Merge: 9769df89f bf4a27c0e Author: Nick Mathewson Date: Tue Oct 22 12:51:27 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1 changes/ticket31466 | 5 + src/core/or/connection_edge.c | 6 -- 2 fi

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

commit 9537966a0bd080ccc80b91c7b88c53009753239e Merge: c55c75bc9 9769df89f Author: Nick Mathewson Date: Tue Oct 22 12:15:14 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org ht

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

commit 9537966a0bd080ccc80b91c7b88c53009753239e Merge: c55c75bc9 9769df89f Author: Nick Mathewson Date: Tue Oct 22 12:15:14 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org ht

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

commit c476d30e8e1052a502e2c35d9ec044006b261a07 Merge: c37f974b2 9769df89f Author: Nick Mathewson Date: Tue Oct 22 12:15:14 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31594| 5 +++ src/lib/err/backtrace.c | 2 +- src/lib/err/torerr.c| 64

[tor-commits] [tor/maint-0.4.1] log: Don't close file log fds that are being used by the err module

commit a22fbab98690f802ae3bda276078cc7fc767feba Author: teor Date: Wed Sep 4 15:38:58 2019 +1000 log: Don't close file log fds that are being used by the err module Instead, dup() file log fds, before passing them to the err module. Closes 31613, part of 31594. --- src/li

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

commit 2d8b4f9c4896ed332e0918d75dd32bbc2380e66a Merge: 6f3ee65f5 c55c75bc9 Author: Nick Mathewson Date: Tue Oct 22 12:13:56 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org htt

[tor-commits] [tor/maint-0.4.1] changes: file for 31594

commit ebce7059ffbc3a4a8b7ff7cf923b0e6a402f4f33 Author: teor Date: Mon Sep 9 13:53:58 2019 +1000 changes: file for 31594 --- changes/bug31594 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/bug31594 b/changes/bug31594 new file mode 100644 index 0..75e6ec33c --- /de

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

commit d4dde249a04c768381767f67a1a82425bc70baaa Merge: 6965798a1 d1eab0583 Author: Nick Mathewson Date: Tue Oct 22 12:11:50 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1 changes/bug31736 | 3 +++ src/app/config/config.c

[tor-commits] [tor/release-0.4.1] log: Don't close file log fds that are being used by the err module

commit a22fbab98690f802ae3bda276078cc7fc767feba Author: teor Date: Wed Sep 4 15:38:58 2019 +1000 log: Don't close file log fds that are being used by the err module Instead, dup() file log fds, before passing them to the err module. Closes 31613, part of 31594. --- src/li

[tor-commits] [tor/release-0.4.1] log: Close log and err file descriptors before aborting

commit 1609916c79612b5cc3a9b363a22f1a9035f2f77b Author: teor Date: Wed Sep 4 17:16:49 2019 +1000 log: Close log and err file descriptors before aborting Part of 31594. --- src/lib/err/backtrace.c | 2 +- src/lib/err/torerr.c| 16 ++-- src/lib/err/torerr.h

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

commit f954ae6883fcca3522e05fa24fb4b542ee62929c Merge: 8bef3a76a d4dde249a Author: Nick Mathewson Date: Tue Oct 22 12:11:59 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31736 | 3 +++ src/app/config/config.c| 6 +- src/fea

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

commit 24d8b931d0c003ef65317fbe01a9c40aa9c13323 Merge: 2d8b4f9c4 9537966a0 Author: Nick Mathewson Date: Tue Oct 22 12:15:14 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org htt

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

commit d4dde249a04c768381767f67a1a82425bc70baaa Merge: 6965798a1 d1eab0583 Author: Nick Mathewson Date: Tue Oct 22 12:11:50 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1 changes/bug31736 | 3 +++ src/app/config/config.c

[tor-commits] [tor/maint-0.4.1] log: Close log and err file descriptors before aborting

commit 1609916c79612b5cc3a9b363a22f1a9035f2f77b Author: teor Date: Wed Sep 4 17:16:49 2019 +1000 log: Close log and err file descriptors before aborting Part of 31594. --- src/lib/err/backtrace.c | 2 +- src/lib/err/torerr.c| 16 ++-- src/lib/err/torerr.h

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

commit 9769df89fe5bd8ccd802064273cca09efddc2b02 Merge: c1bf4260b ebce7059f Author: Nick Mathewson Date: Tue Oct 22 12:15:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1 changes/bug31594| 5 +++ src/lib/err/backtrace.c | 2 +- src/lib/err/

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

commit 4d43e1bf4f75cac55a2a6a6fdc827c94b20c7f3b Merge: f58439ee5 9537966a0 Author: Nick Mathewson Date: Tue Oct 22 12:15:14 2019 -0400 Merge branch 'maint-0.4.2' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproje

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

commit d4dde249a04c768381767f67a1a82425bc70baaa Merge: 6965798a1 d1eab0583 Author: Nick Mathewson Date: Tue Oct 22 12:11:50 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1 changes/bug31736 | 3 +++ src/app/config/config.c

<    1   2   3   4   5   6   >