[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
commit 768ffb8f43575baac0970659b01e0a484d6bd6de Merge: 72312cdbb a59d54756 Author: Nick Mathewson Date: Fri May 15 10:25:27 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
commit 72312cdbb166e2c0c9d4b6dba049f43c2d35ecdc Merge: d41f1cd3e e63bfca5f Author: Nick Mathewson Date: Thu May 14 10:20:08 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 .travis.yml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
commit 633366efcd24e2221528c378d87f66fe35736f99 Merge: 79ff2b6aa dd795fbee Author: Nick Mathewson Date: Wed May 6 16:58:12 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/bug34078 | 5 + 1 file changed, 5 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
commit dd0ee016e9e386410c374d0dd421f5683ec8476e Merge: 28f453c47 cc397449f Author: Nick Mathewson Date: Wed May 6 16:51:33 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 This is an "ours" merge to avoid taking the 0.3.5 fix for 34078. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
commit 28f453c4764962394bf0cd3a314b2b60af7ee1b4 Merge: 104130609 78a72f819 Author: Nick Mathewson Date: Wed May 6 16:47:03 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
commit 987f2fa50ac26af61917c7a6e13dc62f3ddb23ee Merge: 26fd31fef d380acaec Author: teor Date: Thu Apr 9 11:03:20 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h | 3 ++- src/test/test_dos.c | 24 5 files changed, 23 insertions(+), 16 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
commit cb69a5a1184e1b02523308c6d51b0f8f715f064e Merge: efdbf4243 3150c3035 Author: Nick Mathewson Date: Wed Mar 18 12:16:59 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
commit 57b1d0848e9b42670d6f33e37a2095740726e2b1 Merge: 3c8a4b8fb fe3d8ec38 Author: Nick Mathewson Date: Tue Mar 17 15:22:36 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
commit 4ad3f17c26166b898cd768a6e1835fad2ef67005 Merge: 57b1d0848 0526801ed Author: Nick Mathewson Date: Wed Mar 18 08:20:16 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 src/lib/crypt_ops/crypto_rsa_openssl.c | 7 +++ 1 file changed, 7 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
commit 5f4e14b8c8cd4c8907f669144a5a4bb8b8b7a585 Merge: c22696e36 089e57d22 Author: Nick Mathewson Date: Tue Mar 17 11:45:16 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/trove_2020_003 | 4 src/feature/hs/hs_client.c | 6 +++--- src/feature/hs/hs_service.c| 6 ++ src/lib/crypt_ops/crypto_ed25519.c | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
commit c22696e3606f9873ddbf02b11dc91214853b8317 Merge: 7a9e2a261 1c688ba92 Author: teor Date: Mon Mar 16 20:54:20 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.1 .travis.yml | 2 +- changes/ticket32792 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
commit 7a9e2a261b44b93e244c04593dee8f7757ba32bc Merge: 7f0ad3343 d17108a18 Author: Nick Mathewson Date: Fri Mar 13 16:56:44 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
commit b2e543bfe74bb5855a86429c61c0efc91d660719 Merge: c96cf1494 b9d71f384 Author: Nick Mathewson Date: Fri Mar 13 16:46:16 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/bug33093_logging | 5 + src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
commit 5298113da98f13cfaad4a9ab7b5ac8baa6c37279 Merge: 0ff3e8f4a b9c7c61ea Author: teor Date: Wed Feb 12 12:21:57 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.1 .travis.yml| 2 -- changes/bug32753 | 3 +++ changes/ticket33075| 4 src/app/config/config.c| 2 +- src/feature/relay/router.c | 15 ++- src/test/test_config.c | 22 +++--- 6 files changed, 37 insertions(+), 11 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
