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

commit e75583e71bf87ce6d40a801396cf3def39a60c45 Merge: b8bff426f 768ffb8f4 Author: Nick Mathewson Date: Fri May 15 10:25:27 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit b8bff426f311a5b6cf345e985936b3efd693bfce Merge: b16c1e4cf 72312cdbb Author: Nick Mathewson Date: Thu May 14 10:20:08 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-)

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

commit b16c1e4cf61b9e383b1466eb1c034561be166939 Merge: d46f67ef0 d41f1cd3e Author: Nick Mathewson Date: Wed May 6 17:07:27 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 src/feature/control/btrack_orconn_cevent.c | 1 + 1 file changed, 1 insertion(+)

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

commit f954514b376e6edbe8b1faba0726bdb46acf7729 Merge: d04b708b4 79ff2b6aa Author: Nick Mathewson Date: Wed May 6 16:53:06 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 This is an "ours" merge to avoid taking the 0.4.1 version of the 34078 fix.

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

commit d46f67ef0e840760494e3411a00d13c6a35e7427 Merge: 28ac17f43 633366efc Author: Nick Mathewson Date: Wed May 6 16:58:12 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug34078 | 5 + 1 file changed, 5 insertions(+) ___

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

commit d04b708b4bd47ee8df6796f19b25f558b2b18e91 Merge: bbfc498e2 28f453c47 Author: Nick Mathewson Date: Wed May 6 16:47:03 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 configure.ac | 16 src/core/proto/proto_socks.c | 5 -

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

commit bbfc498e21c9854b16b0543bf3f3f4ac304711f7 Merge: 2d34d4d1a a02e86664 Author: Nick Mathewson Date: Mon May 4 10:25:52 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files

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

commit 2d7e08d57ef5d3b785cfaa6961d6d3c73fe59535 Merge: 048714d2c 987f2fa50 Author: teor Date: Thu Apr 9 11:03:27 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

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

commit 048714d2ceab0d4658f0d11c50c6fd57f042e1ed Merge: 3aa855dc6 26fd31fef Author: Nick Mathewson Date: Wed Mar 25 10:56:27 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 .appveyor.yml| 16 ++-- changes/bug33673 | 6 ++ 2 files changed, 20 insertions(+), 2

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

commit 3aa855dc6877fc281082e2cdaba242d2cc06430f Merge: 190cda0e2 42ea03eb7 Author: teor Date: Fri Mar 20 11:24:51 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .appveyor.yml | 2 +- changes/ticket33643 | 5 + changes/ticket33643_part2 | 3 +++

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

commit 190cda0e2ba2faa300758f4899a6c28de6886bfc Merge: a17f4b11b cb69a5a11 Author: Nick Mathewson Date: Wed Mar 18 12:17:11 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" to avoid version bump. ___ tor-commits mailing

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

commit 85141a3a74efb0db29ff98667e83b06208d1c926 Merge: 4ee269941 57b1d0848 Author: Nick Mathewson Date: Tue Mar 17 15:22:36 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/ticket33119| 8 + src/feature/dirparse/parsecommon.c | 9 -

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

commit 758deaa472b879645828c1ee585eb6ce8b8a9a50 Merge: 85141a3a7 4ad3f17c2 Author: Nick Mathewson Date: Wed Mar 18 08:20:16 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 src/lib/crypt_ops/crypto_rsa_openssl.c | 7 +++ 1 file changed, 7 insertions(+)

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

commit 4ee2699416dc612b859f6ba77e6fcd2e7e55c1b7 Merge: e15a621ac cec647ff3 Author: Nick Mathewson Date: Tue Mar 17 13:56:10 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/ticket33619 | 5 + src/core/or/circuitpadding.c | 9 ++--- 2 files changed, 11

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

commit e15a621ac81c472f69a082180fa9b4ed39274e43 Merge: 9ef8f5d1b 5f4e14b8c Author: Nick Mathewson Date: Tue Mar 17 11:45:16 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/trove_2020_003 | 4 src/feature/hs/hs_client.c | 6 +++---

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

commit 9ef8f5d1b8c646d1383327a3d45cddf27ab4b886 Merge: 2f4fa423c c22696e36 Author: teor Date: Mon Mar 16 20:54:27 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 2 +- changes/ticket32792 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

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

commit 2f4fa423c30c81092f06fb97c20f5d281b3cfac7 Merge: 2c1a49c46 7a9e2a261 Author: Nick Mathewson Date: Fri Mar 13 16:57:03 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" to avoid version bump. ___ tor-commits mailing

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

commit 6ed2c9e5fa8c4699cd55bae51248ae24c4d43d3f Merge: b50494233 b2e543bfe Author: Nick Mathewson Date: Fri Mar 13 16:46:16 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug33093_logging | 5 + src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 7 insertions(+), 2

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

commit ff52205362f5d60c209f298a3e3679bc65bdf539 Merge: 00fe21472 5298113da Author: teor Date: Wed Feb 12 12:22:04 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml| 2 -- changes/bug32753 | 3 +++ changes/ticket33075| 4

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

commit 00fe214729b935adc522883fa84b399429fefa74 Merge: 0c90fc37e 0ff3e8f4a Author: Nick Mathewson Date: Tue Feb 11 08:53:00 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" merge, since the exceptions.txt file is already fixed in this branch.

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

commit 0c90fc37ec7fcee01db6bc5e0784e759a7ec954c Merge: c5e610af0 71c49f735 Author: Nick Mathewson Date: Mon Feb 10 14:17:10 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/ticket33212 | 4 src/rust/protover/protover.rs | 2 +- 2 files changed, 5

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

commit c5e610af05dc7112a9b3aa18feeb6ba63290ff5c Merge: 49cffee63 7afb95d3e Author: Nick Mathewson Date: Thu Jan 30 11:19:23 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 Using "ours" strategy to avoid version bump ___

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

commit 0fb407591b8e5e028884aa6e07b7b1550bd0c703 Merge: 7b6be02a9 ec7f99e6e Author: Nick Mathewson Date: Wed Jan 29 19:42:43 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "Ours" merge to avoid version bump. ___ tor-commits

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

commit 7b6be02a923075ec3966d967cca26eb8d16b645e Merge: 48187248d 6b392c333 Author: teor Date: Thu Jan 30 07:55:12 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug29819 | 8 changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++--

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

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.org

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

commit 2d8d6d1ebfd62ebc6da931170d949d8c02f67b76 Merge: 16e94dc7a f5461a4bd Author: Nick Mathewson Date: Mon Jan 6 08:08:59 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug32841 | 4 changes/bug32877 | 4 2 files changed, 4 insertions(+), 4 deletions(-)

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

commit 16e94dc7a70e90fe7a1617ffeef817f3394fe382 Merge: 5dbb607e9 b9d81282e Author: Nick Mathewson Date: Mon Jan 6 08:06:54 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug32877 | 4 src/lib/sandbox/sandbox.c | 1 + 2 files changed, 5 insertions(+)

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

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.org

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

commit bd11fb10962f5b6e7d51ff5a0e6263ad39d4d184 Merge: 933b0c1b1 ffccf6fc5 Author: teor Date: Mon Dec 16 08:16:20 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 branch 'maint-0.4.1' into maint-0.4.2

commit 17561434ebcf01eaa86737b2acfb65df8b57a8b5 Merge: 3248630fc 7174a80ed Author: Nick Mathewson Date: Mon Dec 9 16:03:01 2019 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" to avoid version bump. ___ tor-commits mailing

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

commit 3248630fc81b24b22e337fab70d67c966b059356 Merge: 0a33522b6 6513102b9 Author: Nick Mathewson Date: Fri Dec 6 16:02:08 2019 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/geoip-2019-12-03 | 4 + src/config/geoip | 13933

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

commit f8df0f5f32a1deaeb329ad78f05d209173c5f458 Merge: bb786797a 8933c7908 Author: Nick Mathewson Date: Thu Dec 5 13:32:06 2019 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" to avoid version bump. ___ tor-commits mailing

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

commit bb786797aa449389d47f7bf94fb5fa238e51e377 Merge: 3207a8e5c cfa9cc34a Author: teor Date: Thu Dec 5 10:14:08 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 branch 'maint-0.4.1' into maint-0.4.2

commit 3207a8e5c21de7d49d7e1c854bf6c0dba23d84a1 Merge: eb8170408 14089a29b Author: teor Date: Tue Dec 3 12:46:58 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5

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

commit 3d6545250e49b732292bb8ac1a3f01d198537b0b Merge: 969ee5d77 26071aa3b Author: teor Date: Mon Nov 25 12:37:15 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 branch 'maint-0.4.1' into maint-0.4.2

commit a920597f629c4eee959e0f789d7b6da48da74579 Merge: 8b1f99c29 29eb7b07e Author: Nick Mathewson Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751

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

commit 8b1f99c29d6bcdbd3598b835b7084cee30383d01 Merge: 1f3bf10d3 7043be968 Author: teor Date: Mon Nov 11 14:19:55 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .appveyor.yml| 2 +- changes/bug32449 | 5 + 2 files changed, 6 insertions(+), 1 deletion(-)

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

commit 76fd872db88782c6bce1b539e27ba1d1ab88cbdb Merge: 2395800d3 de6ceb0be Author: teor Date: Wed Nov 6 11:19:54 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 branch 'maint-0.4.1' into maint-0.4.2

commit 2395800d3e333ec4637ece4bee0a0a1af81c0cbc Merge: d7c40beea 63aff4a43 Author: teor Date: Tue Oct 29 08:26:55 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 7 --- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-)

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

commit d7c40beeab85198a1081dca60201f5e1f265fe13 Merge: c8aa3cc17 63581d55a Author: teor Date: Fri Oct 25 10:56:13 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml| 12 ++-- changes/ticket31919_bionic | 5 + 2 files changed, 15 insertions(+),

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

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 'maint-0.4.1' into maint-0.4.2

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

[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

[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

[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

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

commit 34f3d8d407d67a617aef54ac78326c1c1e34936b Merge: e5b9eefb0 d4dde249a Author: Nick Mathewson Date: Tue Oct 22 12:11:59 2019 -0400 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 branch 'maint-0.4.1' into maint-0.4.2

commit c55c75bc9747b8c0d9763c4f5cb248b65836c615 Merge: 34f3d8d40 c1bf4260b Author: Nick Mathewson Date: Tue Oct 22 12:13:55 2019 -0400 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 branch 'maint-0.4.1' into maint-0.4.2

commit e5b9eefb02ddd951d3b959ebb5d2ca72ea65a9a9 Merge: cbc67241d 6965798a1 Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 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 branch 'maint-0.4.1' into maint-0.4.2

commit cbc67241dbe79d57eb1708b504b18f0cf12aeef1 Merge: f98b59524 4c8af10f0 Author: Nick Mathewson Date: Tue Oct 22 12:08:53 2019 -0400 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 branch 'maint-0.4.1' into maint-0.4.2

commit f98b59524c44843d992688562fde27cbbedc11f9 Merge: 8f84999f5 2318bb237 Author: teor Date: Tue Oct 22 20:48:20 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 branch 'maint-0.4.1' into maint-0.4.2

commit 7a35c8d8bec8243820149b4560429c3b91c35f74 Merge: 04e9e74f1 53aa15963 Author: Nick Mathewson Date: Mon Oct 21 18:44:44 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 .appveyor.yml | 8 changes/ticket32086 | 3 +++ 2 files changed, 7 insertions(+), 4

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

commit 8ac9af2330e99032445055d6728e9b3fe34a3470 Merge: 92c4dc9b1 400e31ad1 Author: teor Date: Thu Oct 17 14:52:15 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org