[tor-commits] [tor/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] 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