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

commit 1cd20ff848eab6ee7b441c5aab0578ab02a114bc Merge: 05908d57f 7dd594609 Author: teor Date: Mon Dec 16 08:15:55 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/master] Merge branch 'maint-0.2.9' into maint-0.3.5

commit 74cae547e5159049bc49057b994d57e29f06e992 Merge: c53567c36 b7b467d3a Author: Nick Mathewson Date: Fri Dec 6 16:02:07 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-12-03 | 4 + src/config/geoip | 13933

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

commit 145ff92d9298ff2e9913b591a91a76ea0846f361 Merge: 501b5174d 792c15fde Author: teor Date: Tue Dec 3 12:45:41 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Merge C_DIALECT_OPTIONS from ticket32500_029 with other configure options from maint-0.3.5. .travis.yml

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

commit 7beaaed245e99c57a5b35c266da4ff9fa5f2b113 Merge: 2abff832d 853b6ad09 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751

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

commit 1bde356bf645f3c3d3b0a6e70c03e2baf9f89d26 Merge: 4abfcb799 0650bf369 Author: teor Date: Wed Nov 6 11:19:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/bug31107 | 4 src/core/or/channeltls.c | 10 +- 2 files changed, 13 insertions(+), 1

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

commit 15d67842f9c1cb993491cf473478999dace7c6c2 Merge: e03db9934 752c35ca9 Author: teor Date: Tue Oct 29 08:26:32 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 .travis.yml | 7 --- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff

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

commit e03db9934a0d26da0b119a2d15d51c4c658af1c8 Merge: 1eb57b20b 93be7275e Author: teor Date: Fri Oct 25 10:55:51 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/ticket31919_bionic | 5 + 1 file changed, 5 insertions(+)

[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

[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.2.9' into maint-0.3.5

commit 4b8e5ea0dce85bb96ce92f171246aa101feda4ac Merge: 702aa8f77 c660f4796 Author: teor Date: Thu Oct 17 14:51:50 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/master] Merge branch 'maint-0.2.9' into maint-0.3.5

commit 7b9cb4c47bc9d1ca4e120af2b00a0f0747cd7b20 Merge: 02840169d 90de776ea Author: Nick Mathewson Date: Wed Oct 2 08:01:33 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-10-01 | 4 + src/config/geoip | 35299

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

commit 50b45c43eb990b0b9b76a550b03eb9db229ad4f8 Merge: dc41e6a80 967460389 Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

commit 2ebe1fcd52778ea2d305331f4283366eb35c9d93 Merge: 97f7efa9e 484710f25 Author: Nick Mathewson Date: Tue Sep 17 18:57:49 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 "ours" merge to avoid picking up 0.2.9 version of ticket 31673.

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

commit 5653b93a1d25e173bebb8f45d364e3a578572789 Merge: d253b31ce 5a1c3e44f Author: Nick Mathewson Date: Mon Aug 19 10:37:21 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/ticket31406 | 3 +++ src/app/config/auth_dirs.inc | 2 +- 2 files changed, 4 insertions(+),

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

commit 5df0b36623005526588c35cb63b47dd256dcc5b7 Merge: 654769bce 254c1bac4 Author: teor Date: Sat Aug 10 07:25:57 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Delete src/or/buffers.c which was fixup'ed in 0.2.9 but moved in 0.3.5. The 0.2.9 fix is not required for

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

commit 1bc2ae7be7c0f418de565b4a11bbb5d510c958a9 Merge: e15b9b179 8d22c09ab Author: teor Date: Thu Aug 8 11:10:15 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Merge rust additions in 0.3.5 with sudo deletions in 0.2.9. ___

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

commit 1dd95278970f9f32d83a31fe73e0258a30523539 Merge: b0fa1f4fb fb977f8ca Author: Nick Mathewson Date: Mon Jul 1 14:25:12 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/ticket28795 | 5 + src/app/config/fallback_dirs.inc | 567

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

commit b0fa1f4fb0b4f6a474b20e40e2810936c0577cc2 Merge: dcb8cad4e 0ec4ebd00 Author: Nick Mathewson Date: Tue Jun 11 10:17:17 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985

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

commit a521c427883697fcfa027ffd72bb38f3aee5aceb Merge: cbce8dedd 4e262196a Author: Nick Mathewson Date: Fri May 17 08:10:15 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.4 changes/geoip-2019-05-13 | 4 + src/config/geoip | 15407

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

commit cbce8dedd3703424111928d68dfe8920900ce054 Merge: 116970dda 2460b4461 Author: teor Date: Fri Apr 19 11:59:18 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.4 "ours" merge, to avoid taking any changes from PR 792 in 0.3.4. (We already merged PR 791 for 29665 into

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

commit 4d504bf098069538984690de7966a907180c7efe Merge: 48e990359 ec213ae8a Author: teor Date: Fri Apr 19 11:39:17 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.4 "ours" merge, to avoid taking any changes from PR 772 in 0.3.4. (We already merged a different fix for 23790

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

commit 48e990359b05661f2dd0ae503143ee9b18442475 Merge: 102178e6d a0db5ade3 Author: teor Date: Sat Apr 6 09:33:11 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.4 changes/bug30021| 8 src/common/tortls.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

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

commit 3cfcfbac46d15f7d1cc47da03482aa70583aa455 Merge: 74775b2df 54e249e26 Author: Nick Mathewson Date: Wed Apr 3 09:27:42 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.4 changes/geoip-2019-04-02 | 4 + src/config/geoip | 10355

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

commit 74775b2dfd1a30abf75f2989195ec6c1bbe95fc0 Merge: 6d057c56f f7688cb17 Author: teor Date: Tue Apr 2 11:45:13 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.4 changes/bug29703 | 4 1 file changed, 4 insertions(+) ___

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

commit d7a5fdcb7408536008e8142becc323148e901da5 Merge: aec6ee201 db2ac3b9f Author: teor Date: Wed Mar 20 09:47:55 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit e021f89f3636d197058dddea4383632bdf466ff0 Merge: f3b17a6b2 8bd9b2a6a Author: teor Date: Thu Mar 14 06:56:38 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.4 changes/bug25733 | 4 1 file changed, 4 insertions(+) ___

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

commit 0c9cd7c487ac75d9505f46e5ff42087d383eb1b4 Merge: 76b55fde8 2e74edb53 Author: Nick Mathewson Date: Wed Mar 6 14:29:29 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-03-04 | 4 + src/config/geoip | 12163

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

commit 76b55fde815f3f61161ba21adf90154fc2e53907 Merge: be71cce9f 7786198ee Author: teor Date: Fri Mar 1 14:15:59 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 3313444ef08b891d344b1965a7776260c02f27ab Merge: 6c966b894 4d9eb4dd0 Author: teor Date: Thu Feb 28 10:45:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug29599 | 3 +++ src/test/test_shared_random.c | 5 +++-- 2 files changed, 6 insertions(+), 2

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

commit 6c966b894c2115d18ad5aecc7d02e7b96fea1daf Merge: fb309f6eb 4417ac880 Author: teor Date: Wed Feb 27 09:37:36 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug29145| 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff

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

commit 7ead2af622b968e3dc843de0d49a8b3898e53506 Merge: 4d7a0a131 a3f9ddcf0 Author: Nick Mathewson Date: Tue Feb 12 09:56:49 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-02-05 | 4 + src/config/geoip | 22020

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

commit d1c0dbabfaa2d26839af55c834677b667479b369 Merge: 4cca7fb99 dd6c2b0ad Author: Nick Mathewson Date: Wed Jan 23 09:50:38 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 "ours" merge to avoid dropping non-broken changes files after removal of merged 0.2.9 changes

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

commit 4cca7fb99b814d772587facbabfc9b5ad5b40d45 Merge: b5fdb91ad 89a0b7774 Author: Nick Mathewson Date: Fri Jan 18 12:25:08 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug29029 | 5 + src/or/rendmid.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)

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

commit ba71b178655fcec2ad55383987001d2fd6a3873d Merge: fee2eaf2d 445d6750f Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599

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

commit fee2eaf2d4b401c0e6d879224bf42992a780085a Merge: bf8bb9c52 73de7b4bc Author: Nick Mathewson Date: Fri Jan 4 15:04:58 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 93019b4787e71a56d3d3f3bc89f65919930f1dda Merge: c1f919158 3b5188576 Author: Nick Mathewson Date: Tue Dec 11 10:00:22 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/ticket24803 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit c1f9191581eae2d04a4ffacf7a7066a16c9f5eae Merge: 00341d97f 4991b2931 Author: Nick Mathewson Date: Tue Dec 11 09:41:04 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/ticket24803 | 5 + src/or/fallback_dirs.inc | 581

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

commit 00341d97f356142619865218b2ff6a6ae95dca5d Merge: ffc7b81b5 57798eb1c Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100

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

commit cbe04d455016233f4759fe281c07dd7db6096c2a Merge: aebe8a82c 8569166c7 Author: Nick Mathewson Date: Thu Nov 15 16:54:16 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug24104| 4 ++ src/or/rephist.c| 7 ++- src/or/rephist.h|

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

commit 54d1a2d80537e9f9a90dcca18c9e616f73809f58 Merge: 93b6d4137 7f042cbc0 Author: Nick Mathewson Date: Tue Nov 13 08:27:17 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug28413 | 4 src/common/aes.c | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff

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

commit 93b6d4137491cffc906e34dcd3cd4d284ad89e2f Merge: d0c3723c3 46796623f Author: Nick Mathewson Date: Sun Nov 11 18:05:45 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 src/common/tortls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit d0c3723c38e0dba2ec1474c1c3ed75c6d0a7099f Merge: c06b7f090 5ba3d09a8 Author: Nick Mathewson Date: Sun Nov 11 11:57:52 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2018-11-06 | 4 + src/config/geoip | 22164

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

commit c06b7f090cfe49cef1b174d69277534eb0441696 Merge: 6bd069630 45e0004b6 Author: Nick Mathewson Date: Fri Nov 9 10:49:47 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug28245| 6 ++ configure.ac| 1 + src/common/tortls.c | 17 + 3

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

commit bcc1a7180870368b69d51706226c2f667c482506 Merge: 038bc21f8 0a824bd88 Author: Nick Mathewson Date: Wed Oct 31 11:01:40 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug27948| 6 ++ src/test/bt_test.py | 10 ++ 2 files changed, 12 insertions(+), 4

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

commit 86e0be421f14f386327f95df2cea0b3c59323463 Merge: 796e36e53 5b28190c6 Author: Nick Mathewson Date: Mon Oct 15 12:47:46 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.3 src/common/util_bug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

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

commit dff7d3d00ad5e3f9e59cd4b11f302601790d1061 Merge: f7e93cf2e b11339965 Author: Nick Mathewson Date: Mon Oct 15 10:37:49 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug27709 | 4 src/common/util_bug.h | 57

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

commit f7e93cf2e7c80fa6dc6c907893b7b01c31b588d1 Merge: cc10873de 717507e3b Author: Nick Mathewson Date: Wed Oct 10 17:12:34 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit b057623bedad74b147d71f00c47dca7bd5fac14a Merge: 2cadd93ce 119df9c1c Author: Nick Mathewson Date: Wed Oct 10 11:34:48 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2018-10-09 | 4 + src/config/geoip | 38518

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

commit 5b04392c1553e2a3e278a48f8d0e071181c0444f Merge: 0971b3ce4 e24195c7c Author: Nick Mathewson Date: Fri Sep 21 09:35:23 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27316 | 3 +++ src/or/protover.c| 15 +++ src/test/test_protover.c |

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

commit 12258bbb9056ae400a58de4eb57c3de079b21782 Merge: 2968c716d b205714ba Author: David Goulet Date: Tue Jul 3 13:31:06 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26535.029 | 5 + src/test/ntor_ref.py | 9 ++--- 2 files changed, 11 insertions(+), 3

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

commit 9697c2da4680267038d407093cbcbc4c68059904 Merge: 5a8827a4c c02f2d9eb Author: Nick Mathewson Date: Thu Sep 13 11:46:04 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27658 | 6 ++ src/ext/tinytest.c | 12 ++-- 2 files changed, 16 insertions(+), 2

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

commit 5a8827a4c98a354c775060f6c85c05a97c56e9b4 Merge: c3a750486 198b6354e Author: Nick Mathewson Date: Tue Sep 11 13:09:21 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 3119cb5062e2cc7aee46c853a9c7373e6efdaaea Merge: 8408331b3 19429fac2 Author: Nick Mathewson Date: Tue Sep 11 12:04:55 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/geoip-2018-09-06 | 4 + src/config/geoip | 49324

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

commit 8408331b3e965dfad3c79fadc51f0b01eed366fe Merge: ec4a7641f b203dedaf Author: Nick Mathewson Date: Mon Sep 10 09:41:39 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 "ours" to avoid version bump. ___ tor-commits mailing

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

commit 36885f34f6e8dc7f5791e4ba2c4eefff5f9de9e0 Merge: cdaf9aec8 da29074fc Author: Nick Mathewson Date: Fri Sep 7 15:11:49 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 "ours" to avoid bump ___ tor-commits mailing list

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

commit 0366ae224cb3b9cd55905201cd1b55a03f2736e9 Merge: 987e12a58 1e46a391b Author: Nick Mathewson Date: Fri Sep 7 09:15:52 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27344| 4 configure.ac| 1 + src/common/tortls.c | 7 ++- 3 files changed, 11

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

commit 987e12a58f6ce9e0001413e665ac2aa92869af77 Merge: eacaff6cc 9fcb3ef78 Author: Nick Mathewson Date: Fri Sep 7 08:46:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit a5ed62f96cafa1be251f9a7b4aafa519de4c2645 Merge: a08e6e711 912ae2b8d Author: Nick Mathewson Date: Fri Sep 7 08:44:39 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27463| 3 +++ src/or/rendclient.c | 9 + 2 files changed, 12 insertions(+)

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

commit a08e6e711fbcd6a12818f1fe14739fc0e870434d Merge: 57b207efa 1570f17f9 Author: Nick Mathewson Date: Fri Sep 7 08:42:19 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27465 | 5 + src/common/address.c | 5 - 2 files changed, 9 insertions(+), 1

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

commit 57b207efa42e0a2794457cc7aff9c662d9000b44 Merge: 2b1b8bf2c ff1486385 Author: Nick Mathewson Date: Wed Sep 5 10:15:42 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc

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

commit 2b1b8bf2cad4af304d38f88e38047da7e0be Merge: b40f9967f 4e4b6a247 Author: Nick Mathewson Date: Wed Sep 5 09:56:19 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 .travis.yml | 6 +++--- changes/bug27453 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)

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

commit b40f9967fa31faa1dcf1a977989e235fbe836015 Merge: 70a07fa90 541b89b06 Author: Nick Mathewson Date: Wed Aug 29 11:17:31 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 Makefile.am | 3 ++- changes/bug27295 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff

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

commit 36bb11a65081bb0c2a2a86359c6386bde67f8046 Merge: c1ad40627 cc4ea34a2 Author: Nick Mathewson Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27185 | 3 +++ src/test/test.c | 10 ++ 2 files changed, 5 insertions(+), 8 deletions(-)

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

commit c1ad40627bbccf2682f56053c77ff719c822cbce Merge: a5bbe3f1d 9068e2fa2 Author: Nick Mathewson Date: Wed Aug 22 09:37:31 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 src/or/connection_edge.c | 1 - src/test/test_tortls.c | 3 +-- 2 files changed, 1 insertion(+), 3

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

commit a5bbe3f1d0d8162e70af01f6b3956412dcc75946 Merge: a29e9a901 05d62a3b7 Author: Nick Mathewson Date: Tue Aug 21 20:03:46 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit d52f406001082474c3decf04747bf6f742b82c96 Merge: c798957b5 85a879234 Author: Nick Mathewson Date: Tue Aug 21 19:16:40 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27226 | 5 +++ src/common/tortls.c| 10 +++-- src/test/test_tortls.c | 119

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

commit a26a2735b9cf9c6940d784f755f983088c333833 Merge: 8982719f6 4c355ff18 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-)

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

commit 8982719f6ac06383c26283b60acf6b3d3fde613e Merge: 8e68fe7e1 fe19b40fe Author: Nick Mathewson Date: Thu Aug 9 08:47:24 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/geoip-2018-08-07 | 4 + src/config/geoip | 14291

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

commit 8e68fe7e1c84e4ad513cd6b0af686a51c49e55cb Merge: 4856a6e6c 27a2a6cb9 Author: Nick Mathewson Date: Wed Aug 8 09:26:22 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug25440 | 5 + src/common/sandbox.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

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

commit 4856a6e6c4b352f04b98f7f77c70a0c33dc8c29c Merge: fea35ddf0 42c6ebda1 Author: Nick Mathewson Date: Fri Aug 3 07:33:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug20424_029_minimal | 4 configure.ac | 4 2 files changed, 8 insertions(+)

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

commit 312a42fc854a732d5f0fe4d5dcc1f567c2e069f4 Merge: 78386d8cd 93da2cae4 Author: Nick Mathewson Date: Wed Jul 18 16:39:25 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug26787 | 3 +++ 1 file changed, 3 insertions(+) ___

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

commit 78386d8cdd67ca9c00e77d5d8e6604c0841a7098 Merge: 559f79fd7 501deba8c Author: Nick Mathewson Date: Wed Jul 18 16:39:10 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 src/test/test_bt.sh | 2 ++ 1 file changed, 2 insertions(+)

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

commit 559f79fd79b7c22caac2888f82e92307be02904a Merge: 61a2762e3 a321d7240 Author: Nick Mathewson Date: Wed Jul 18 15:03:27 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug26485| 4 src/or/config.c | 9 - src/or/dirserv.c| 43

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

commit 61a2762e353f29b8b4402bf068e6268809174702 Merge: 98ee23ca1 6dafddd05 Author: Nick Mathewson Date: Tue Jul 17 14:56:52 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug26830| 3 +++ src/test/test_keygen.sh | 8 2 files changed, 11 insertions(+)

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

commit 98ee23ca1e09cb6ac9e4b8e4bca67557ebb69906 Merge: 6ad2c2b92 cd4795ca3 Author: Nick Mathewson Date: Thu Jul 12 14:32:16 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/task26771| 4 src/or/auth_dirs.inc | 4 ++-- 2 files changed, 6 insertions(+), 2

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

commit 4a604d99382e4aad3df257e265c852f306f7bc7f Merge: d3894dc34 8b53dfc36 Author: Nick Mathewson Date: Mon Jul 9 10:14:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug26269 | 5 + src/or/router.c | 15 +-- 2 files changed, 14 insertions(+), 6

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

commit d3894dc34b66fc5090b674ff850071aaf319d1c8 Merge: a4e8f9450 9faa28b60 Author: Nick Mathewson Date: Mon Jul 9 09:11:41 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/geoip-2018-07-03 |4 + src/config/geoip | 7171

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

commit a4e8f945077b8eebbbd5be85f89b1631305ce1cc Merge: e6366f787 b205714ba Author: Nick Mathewson Date: Tue Jul 3 09:48:03 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug26535.029 | 5 + src/test/ntor_ref.py | 9 ++--- 2 files changed, 11 insertions(+), 3

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

commit 2968c716d7689eafcf32a1f5327af7b1ad1582ce Merge: a3ec89a4f 1953a7e61 Author: Nick Mathewson Date: Fri Jun 29 23:11:47 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 scripts/maint/checkSpace.pl | 5 - 1 file changed, 5 deletions(-) diff --cc scripts/maint/checkSpace.pl

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

commit a3ec89a4f8a6222403697b7f7fce5d5138b79994 Merge: d583459d5 3c0a63c40 Author: Nick Mathewson Date: Fri Jun 29 13:49:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/test/test_shared_random.c | 1 + 1 file changed, 1 insertion(+)

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

commit ea14d3408df7c846722b54484cf5b8d61de5384f Merge: b89a66e99 890bc15ab Author: Nick Mathewson Date: Fri Jun 29 13:06:15 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26467 | 3 +++ 1 file changed, 3 insertions(+)

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

commit 1385a5118d55edd3dd672eeb793b662853f30758 Merge: d6d3f8486 b426e83f0 Author: Nick Mathewson Date: Fri Jun 29 13:00:56 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/or/routerlist.c | 2 ++ src/or/shared_random_state.c | 1 + src/test/test_hs.c| 7

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

commit d6d3f8486dbac9837a793f431dcd58505e7274e4 Merge: 340fcc7e2 fcd26af7c Author: Nick Mathewson Date: Tue Jun 26 09:21:59 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/feature26372_029 | 4 configure.ac | 6 +- 2 files changed, 9 insertions(+), 1

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

commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 Merge: 9713ecfc4 dd69e74e3 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9 Merge: d84581a3e ef671147f Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

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

commit 19f386852333a6de5fbf9bcb3a4415b3bb135b4d Merge: 1ef8023e0 ae540569c Author: Nick Mathewson Date: Tue Jun 12 08:11:19 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-06-07 |4 + src/config/geoip | 5848

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

commit 1ef8023e000d9136b7069515f9d7303810a8f3b2 Merge: f48fb8a72 719b5c1d2 Author: Nick Mathewson Date: Fri Jun 8 10:11:57 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26196 | 4 src/or/protover.c | 13 + 2 files changed, 17 insertions(+)

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

commit f48fb8a720c7cca79249248f92e3bc99cee3414d Merge: d3a972561 c380562ae Author: Nick Mathewson Date: Thu May 24 09:40:06 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26116 | 7 +++ src/common/crypto.c| 7 ++-

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

commit d3a972561aeb38d7b346be1826054c60bf3adfaa Merge: 502d2c006 d1e4ffc71 Author: Nick Mathewson Date: Wed May 16 12:11:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26072 | 5 + src/or/relay.c | 1 + 2 files changed, 6 insertions(+)

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

commit 502d2c00625501f312496d842aeb16a840d4d7b0 Merge: 2d61a8351 033e4723f Author: Nick Mathewson Date: Tue May 15 09:32:44 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-05-01 |4 + src/config/geoip | 5455

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

commit ba70439210c57b0e0e60b07f116f101725085d85 Merge: aa08c1970 edb6acf9c Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

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

commit aa08c197034a7dcd061f3c205a29dc1cb09641d3 Merge: 6361a250f bca8a104b Author: Nick Mathewson Date: Thu May 10 08:00:35 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26062| 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3

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

commit 6361a250f08421aa1e6db1093aaa488ee24ce77d Merge: 726f238b7 5227754b2 Author: Nick Mathewson Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 ___ tor-commits mailing list

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

commit 993e314c6f08d587480070e9f19d313b81b39a09 Merge: bb35405d2 d465bd27e Author: Nick Mathewson Date: Wed May 2 08:46:28 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26007 | 5 + src/or/dirserv.c | 13 +++-- 2 files changed, 16

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

commit 5cc3a0379eba0eb4e9baac97468fcaebcc654437 Merge: e88863407 34e7dca9c Author: Nick Mathewson Date: Tue Apr 24 10:38:37 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 5 - changes/travis_distcheck | 4 2 files changed,

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

commit 5c3639923fb3d7a1bfc7b38248001e67333fa35e Merge: ce8e7427b 9727b4c5d Author: Nick Mathewson Date: Mon Apr 23 09:23:31 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6

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

commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d Merge: 5e0fbd700 d3ff12630 Author: Nick Mathewson Date: Tue Apr 17 10:47:30 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11

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

commit 5e0fbd7006993a4e402f2eee49f6f86074923197 Merge: db6902c23 0e13ff481 Author: Nick Mathewson Date: Mon Apr 16 13:48:23 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/common/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit db6902c23530f8d58e999701685e9cbd74b15a82 Merge: e813116d3 10a1969ca Author: Nick Mathewson Date: Tue Apr 10 14:26:29 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33

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

commit 834eef2452a667c5557e5a09bb879cc2fc98a661 Merge: 5acfc3087 b68e636b3 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

  1   2   3   >