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

2019-12-15 Thread teor
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-12-06 Thread nickm
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-12-02 Thread teor
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-11-11 Thread nickm
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-11-05 Thread teor
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-10-28 Thread teor
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-10-24 Thread teor
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-10-22 Thread teor
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-10-22 Thread teor
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-10-16 Thread teor
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-10-02 Thread nickm
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-09-17 Thread nickm
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-09-17 Thread nickm
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-08-19 Thread nickm
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-08-09 Thread teor
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-08-08 Thread teor
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-07-01 Thread nickm
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/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-06-11 Thread nickm
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