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

2019-02-27 Thread teor
commit 600f5f0db47d970fe535b24b5004d5765c66d4a2 Merge: 065cfc473 aef6e6134 Author: teor Date: Thu Feb 28 10:50:01 2019 +1000 Merge branch 'maint-0.4.0' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-02-27 Thread teor
commit 065cfc473be0a24606d14b3836dc93fc438d66b0 Merge: 761eb4cf7 90c8956e2 Author: teor Date: Thu Feb 28 10:46:29 2019 +1000 Merge branch 'maint-0.4.0' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-02-27 Thread nickm
commit 761eb4cf79d24a7971be9c1b4f6c969a5db28fab Merge: ef12ab83c 56f01e58b Author: Nick Mathewson Date: Wed Feb 27 09:59:42 2019 -0500 Merge branch 'maint-0.4.0' changes/bug29599 | 3 +++ src/test/test_shared_random.c | 5 +++-- 2 files changed, 6 insertions(+), 2

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

2019-02-26 Thread teor
commit ef12ab83c076069cba2de73f0aec61453949e912 Merge: 39a104993 ef2925e74 Author: teor Date: Wed Feb 27 09:38:33 2019 +1000 Merge branch 'maint-0.4.0' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-02-26 Thread dgoulet
commit 2a44ee9b8c75cd8bad01a3b5142a1897edb6f824 Merge: 3ac8cdb8c a5dd41b9a Author: David Goulet Date: Tue Feb 26 11:25:16 2019 -0500 Merge branch 'maint-0.4.0' changes/bug29017 | 4 doc/tor.1.txt | 2 +- src/feature/relay/router.c | 11 +-- 3 files

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

2019-02-26 Thread dgoulet
commit 3ac8cdb8cf93b3a80c18b66da34d77edd36ec377 Merge: 732855c2e 4746e1261 Author: David Goulet Date: Tue Feb 26 10:53:09 2019 -0500 Merge branch 'maint-0.4.0' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-02-26 Thread nickm
commit 732855c2e533fbab7c9087bf251e38b07bd27af2 Merge: 57d33b578 35257a1c6 Author: Nick Mathewson Date: Tue Feb 26 07:27:50 2019 -0500 Merge branch 'maint-0.4.0' changes/bug13221| 5 + src/app/config/config.c | 8 2 files changed, 9 insertions(+), 4 deletions(-)

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

2019-02-21 Thread nickm
commit 9ac8c854354eac7178eb8e99384f34c5a7abd5f4 Merge: 658770a0f 1bff5646e Author: Nick Mathewson Date: Thu Feb 21 13:25:54 2019 -0500 Merge branch 'maint-0.4.0' "ours" to avoid version bump. ___ tor-commits mailing list

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

2019-02-21 Thread nickm
commit 54e42fe364ad37b18026600d5c2dc6c022bbd53c Merge: d04f6d9df 00a93b19c Author: Nick Mathewson Date: Thu Feb 21 10:08:14 2019 -0500 Merge branch 'maint-0.4.0' changes/ticket29168 | 5 + src/core/or/scheduler_kist.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

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

2019-02-21 Thread nickm
commit d04f6d9dffcb1f67c3fc693284810edee0f61f3d Merge: aa79196ee df3484b2b Author: Nick Mathewson Date: Thu Feb 21 09:52:35 2019 -0500 Merge branch 'maint-0.4.0' "ours" to avoid version bump ___ tor-commits mailing list

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

2019-02-21 Thread nickm
commit aa79196ee05e4ee8169de2156478e7cfba49ef0e Merge: 59c3910be 34183f0d7 Author: Nick Mathewson Date: Thu Feb 21 09:10:34 2019 -0500 Merge branch 'maint-0.4.0' src/test/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

2019-02-20 Thread arma
commit c22446e3055603cdbbea36e31ea49436d9ca3e11 Merge: 4d4eda89a 5ec65be8b Author: Roger Dingledine Date: Wed Feb 20 10:40:20 2019 -0500 Merge branch 'maint-0.4.0' src/test/test_address.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

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

2019-02-20 Thread arma
commit 4d4eda89a1d0f3b19b408349d602bf7ba47e1cdb Merge: 6927e9a60 ccab4347e Author: Roger Dingledine Date: Wed Feb 20 10:36:54 2019 -0500 Merge branch 'maint-0.4.0' changes/ticket28614 | 2 +- changes/ticket29072 | 2 ++ contrib/or-tools/check-tor

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

2019-02-19 Thread nickm
commit c3fca4e4b324aae9be7ebe2077eb50dcbe5f1ac4 Merge: f70929347 4df31adef Author: Nick Mathewson Date: Tue Feb 19 11:51:24 2019 -0500 Merge branch 'maint-0.4.0' changes/bug29508 | 3 +++ src/core/or/scheduler_kist.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

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

2019-02-19 Thread nickm
commit f70929347f084b805fca35107d9f48b4b17b3b33 Merge: 17e29bda5 4bc55ed5e Author: Nick Mathewson Date: Tue Feb 19 11:49:24 2019 -0500 Merge branch 'maint-0.4.0' changes/bug29145| 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

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

2019-02-19 Thread nickm
commit 17e29bda5d4e39e4cb84fa0ad0b011f576b6b6c6 Merge: af36af1a9 b5f3a3d6a Author: Nick Mathewson Date: Tue Feb 19 11:34:25 2019 -0500 Merge branch 'maint-0.4.0' src/test/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

2019-02-19 Thread nickm
commit 8a5c66cbb0adf1ef63f1c5f1048dfbc4c6f7267d Merge: 485803dff 26873bc4e Author: Nick Mathewson Date: Tue Feb 19 11:27:21 2019 -0500 Merge branch 'maint-0.4.0' changes/bug28698 | 3 +++ src/core/or/circuituse.c | 30 ++ 2 files changed, 21

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

2019-02-19 Thread nickm
commit 485803dffe8bfc7852c26144a113716fc84cd998 Merge: 9a158a45b 5c87add92 Author: Nick Mathewson Date: Tue Feb 19 11:21:54 2019 -0500 Merge branch 'maint-0.4.0' changes/bug29298 | 5 + src/test/test_circuitpadding.c | 8 +--- 2 files changed, 10 insertions(+), 3

<    1   2