[tor-commits] [translation/tor-messenger-otrproperties_completed] Update translations for tor-messenger-otrproperties_completed

2017-12-11 Thread translation
commit 1f8fc5a525754eab6edfddcdecfb6d6f332c4bd8 Author: Translation commit bot Date: Tue Dec 12 06:49:43 2017 + Update translations for tor-messenger-otrproperties_completed --- ms_MY/otr.properties | 31 +++ 1 file changed, 31

[tor-commits] [translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties

2017-12-11 Thread translation
commit 5ccf9fd9e11f0be023377f44b6d34514f538a06a Author: Translation commit bot Date: Tue Dec 12 06:49:38 2017 + Update translations for tor-messenger-otrproperties --- ms_MY/otr.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2017-12-11 Thread translation
commit 6978286f065d74be6121ec7def74c8996c2947be Author: Translation commit bot Date: Tue Dec 12 06:47:39 2017 + Update translations for torbutton-torbuttonproperties --- ms_MY/torbutton.properties | 36 ++-- 1 file changed,

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2017-12-11 Thread translation
commit 169225349988f1135ab56a970a49c722771ac8ff Author: Translation commit bot Date: Tue Dec 12 06:47:47 2017 + Update translations for torbutton-torbuttondtd --- ms_MY/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [depictor/master] Add a NoIPv6Consensus flag to indicate when the authorities could not form a consensus about a relay's IPv6 address. Closes #24557

2017-12-11 Thread tom
commit 62a10c50ccb4956ebcd6c010ddf93139c0cc54b6 Author: Tom Ritter Date: Mon Dec 11 15:03:44 2017 -0600 Add a NoIPv6Consensus flag to indicate when the authorities could not form a consensus about a relay's IPv6 address. Closes #24557 --- website.py | 6 ++ 1 file

[tor-commits] [tor/release-0.3.1] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread nickm
commit 8be50ca3ea90ac04b8a18c7d9a33f5ec3f3a6e28 Author: David Goulet Date: Wed Nov 22 09:25:07 2017 -0500 relay: Change bandwidth stats interval to 24 hours Going from 4 hours to 24 hours in order to try reduce the efficiency of guard discovery

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-12-11 Thread nickm
commit 04524443d071f3e310067e0a7ecdc52a97e80107 Merge: 736e7299c 2ea573ece Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2017-12-11 Thread nickm
commit 43fb8fc5cba65edbd882729580e0d67857ecf7fe Merge: e553bf3ce 04524443d Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ tor-commits mailing list

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

2017-12-11 Thread nickm
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef Merge: 7fcb222ab eaaa1108a Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

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

2017-12-11 Thread nickm
commit ee1bbe21ab74873b498b143728c17334cbd3ce5e Merge: b63cbec65 04524443d Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 src/or/rephist.c| 4

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49 Merge: f97f301b5 f5d4bdf30 Author: Nick Mathewson Date: Mon Dec 11 16:54:11 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

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

2017-12-11 Thread nickm
commit 2cfb7b0413d7f1e0b3c5004c8c2877c53b39244b Merge: a14ff6b9c 43fb8fc5c Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 ___ tor-commits mailing list

[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 src/or/rephist.c| 4

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

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874 Merge: 7e486dd6f bc1ea4f47 Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

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

2017-12-11 Thread nickm
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef Merge: 7fcb222ab eaaa1108a Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-12-11 Thread nickm
commit 04524443d071f3e310067e0a7ecdc52a97e80107 Merge: 736e7299c 2ea573ece Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-11 Thread nickm
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef Merge: 7fcb222ab eaaa1108a Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49 Merge: f97f301b5 f5d4bdf30 Author: Nick Mathewson Date: Mon Dec 11 16:54:11 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/release-0.3.0] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 src/or/rephist.c| 4

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49 Merge: f97f301b5 f5d4bdf30 Author: Nick Mathewson Date: Mon Dec 11 16:54:11 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

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

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874 Merge: 7e486dd6f bc1ea4f47 Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

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

2017-12-11 Thread nickm
commit 473725a63d92fc4ef3aabd18d25fd54d53439959 Merge: 3ccd1c0da eaaa1108a Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

2017-12-11 Thread nickm
commit e11830b2b4d3f15fd73703b5f4a7c784d09456f7 Merge: ebf4f3f82 2ea573ece Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2

[tor-commits] [tor/release-0.3.0] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread nickm
commit 8be50ca3ea90ac04b8a18c7d9a33f5ec3f3a6e28 Author: David Goulet Date: Wed Nov 22 09:25:07 2017 -0500 relay: Change bandwidth stats interval to 24 hours Going from 4 hours to 24 hours in order to try reduce the efficiency of guard discovery

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49 Merge: f97f301b5 f5d4bdf30 Author: Nick Mathewson Date: Mon Dec 11 16:54:11 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874 Merge: 7e486dd6f bc1ea4f47 Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-12-11 Thread nickm
commit 04524443d071f3e310067e0a7ecdc52a97e80107 Merge: 736e7299c 2ea573ece Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 src/or/rephist.c| 4

[tor-commits] [tor/release-0.2.8] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread nickm
commit 8be50ca3ea90ac04b8a18c7d9a33f5ec3f3a6e28 Author: David Goulet Date: Wed Nov 22 09:25:07 2017 -0500 relay: Change bandwidth stats interval to 24 hours Going from 4 hours to 24 hours in order to try reduce the efficiency of guard discovery

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

2017-12-11 Thread nickm
commit ca19b2115a761ec37a6af56f6672cc0e16658929 Merge: 20ca62ffb f5d4bdf30 Author: Nick Mathewson Date: Mon Dec 11 16:53:07 2017 -0500 Merge branch 'maint-0.2.5' into release-0.2.5 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2

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

2017-12-11 Thread nickm
commit 422ff8f922d2df7b90aba3e6e16c41100387b282 Merge: 16ec4da68 43fb8fc5c Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 src/or/rephist.c| 4

[tor-commits] [tor/release-0.2.8] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 src/or/rephist.c| 4

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

2017-12-11 Thread nickm
commit 43fb8fc5cba65edbd882729580e0d67857ecf7fe Merge: e553bf3ce 04524443d Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ tor-commits mailing list

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2017-12-11 Thread nickm
commit b077ccde4e890110ddfa9304d5badf261a2942b9 Merge: 3ec72ef52 bc1ea4f47 Author: Nick Mathewson Date: Mon Dec 11 16:54:13 2017 -0500 Merge branch 'maint-0.2.8' into release-0.2.8 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874 Merge: 7e486dd6f bc1ea4f47 Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/release-0.2.9] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread nickm
commit 8be50ca3ea90ac04b8a18c7d9a33f5ec3f3a6e28 Author: David Goulet Date: Wed Nov 22 09:25:07 2017 -0500 relay: Change bandwidth stats interval to 24 hours Going from 4 hours to 24 hours in order to try reduce the efficiency of guard discovery

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49 Merge: f97f301b5 f5d4bdf30 Author: Nick Mathewson Date: Mon Dec 11 16:54:11 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

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

2017-12-11 Thread nickm
commit 04524443d071f3e310067e0a7ecdc52a97e80107 Merge: 736e7299c 2ea573ece Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49 Merge: f97f301b5 f5d4bdf30 Author: Nick Mathewson Date: Mon Dec 11 16:54:11 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49 Merge: f97f301b5 f5d4bdf30 Author: Nick Mathewson Date: Mon Dec 11 16:54:11 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/release-0.2.5] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread nickm
commit 8be50ca3ea90ac04b8a18c7d9a33f5ec3f3a6e28 Author: David Goulet Date: Wed Nov 22 09:25:07 2017 -0500 relay: Change bandwidth stats interval to 24 hours Going from 4 hours to 24 hours in order to try reduce the efficiency of guard discovery

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

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874 Merge: 7e486dd6f bc1ea4f47 Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

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

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874 Merge: 7e486dd6f bc1ea4f47 Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

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

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874 Merge: 7e486dd6f bc1ea4f47 Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

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

2017-12-11 Thread nickm
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef Merge: 7fcb222ab eaaa1108a Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

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

2017-12-11 Thread nickm
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef Merge: 7fcb222ab eaaa1108a Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49 Merge: f97f301b5 f5d4bdf30 Author: Nick Mathewson Date: Mon Dec 11 16:54:11 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/master] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 src/or/rephist.c| 4

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

2017-12-11 Thread nickm
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef Merge: 7fcb222ab eaaa1108a Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

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

2017-12-11 Thread nickm
commit 04524443d071f3e310067e0a7ecdc52a97e80107 Merge: 736e7299c 2ea573ece Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

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

2017-12-11 Thread nickm
commit 43fb8fc5cba65edbd882729580e0d67857ecf7fe Merge: e553bf3ce 04524443d Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ tor-commits mailing list

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874 Merge: 7e486dd6f bc1ea4f47 Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/maint-0.3.1] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread nickm
commit 8be50ca3ea90ac04b8a18c7d9a33f5ec3f3a6e28 Author: David Goulet Date: Wed Nov 22 09:25:07 2017 -0500 relay: Change bandwidth stats interval to 24 hours Going from 4 hours to 24 hours in order to try reduce the efficiency of guard discovery

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 src/or/rephist.c| 4

[tor-commits] [tor/maint-0.3.0] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 src/or/rephist.c| 4

[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 src/or/rephist.c| 4

[tor-commits] [tor/maint-0.3.0] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread nickm
commit 8be50ca3ea90ac04b8a18c7d9a33f5ec3f3a6e28 Author: David Goulet Date: Wed Nov 22 09:25:07 2017 -0500 relay: Change bandwidth stats interval to 24 hours Going from 4 hours to 24 hours in order to try reduce the efficiency of guard discovery

[tor-commits] [tor/maint-0.2.5] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 src/or/rephist.c| 4

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

2017-12-11 Thread nickm
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef Merge: 7fcb222ab eaaa1108a Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49 Merge: f97f301b5 f5d4bdf30 Author: Nick Mathewson Date: Mon Dec 11 16:54:11 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 src/or/rephist.c| 4

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49 Merge: f97f301b5 f5d4bdf30 Author: Nick Mathewson Date: Mon Dec 11 16:54:11 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

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

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874 Merge: 7e486dd6f bc1ea4f47 Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

[tor-commits] [tor/maint-0.2.5] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread nickm
commit 8be50ca3ea90ac04b8a18c7d9a33f5ec3f3a6e28 Author: David Goulet Date: Wed Nov 22 09:25:07 2017 -0500 relay: Change bandwidth stats interval to 24 hours Going from 4 hours to 24 hours in order to try reduce the efficiency of guard discovery

[tor-commits] [tor/maint-0.2.8] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 src/or/rephist.c| 4

[tor-commits] [tor/maint-0.2.9] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread nickm
commit 8be50ca3ea90ac04b8a18c7d9a33f5ec3f3a6e28 Author: David Goulet Date: Wed Nov 22 09:25:07 2017 -0500 relay: Change bandwidth stats interval to 24 hours Going from 4 hours to 24 hours in order to try reduce the efficiency of guard discovery

[tor-commits] [tor/maint-0.2.8] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread nickm
commit 8be50ca3ea90ac04b8a18c7d9a33f5ec3f3a6e28 Author: David Goulet Date: Wed Nov 22 09:25:07 2017 -0500 relay: Change bandwidth stats interval to 24 hours Going from 4 hours to 24 hours in order to try reduce the efficiency of guard discovery

[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49 Merge: f97f301b5 f5d4bdf30 Author: Nick Mathewson Date: Mon Dec 11 16:54:11 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

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

2017-12-11 Thread nickm
commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9 Merge: c55a05423 7e486dd6f Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23985| 9 + src/or/routerlist.c | 5 + 2 files changed, 14

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2017-12-11 Thread nickm
commit e553bf3ce4b68a752f5f75c9f2e78cfc45c68f2a Merge: bfc9be4c7 736e7299c Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ tor-commits mailing list

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-11 Thread nickm
commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9 Merge: c55a05423 7e486dd6f Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23985| 9 + src/or/routerlist.c | 5 + 2 files changed, 14

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

2017-12-11 Thread nickm
commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12 Merge: 953a8f851 0dc55fb24 Author: Nick Mathewson Date: Mon Dec 11 16:51:54 2017 -0500 Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9 changes/bug23985| 9 + src/or/routerlist.c | 5

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

2017-12-11 Thread nickm
commit ebf4f3f823f5d5861ec9114ae8afa03c58074380 Merge: 87de19eff 7fcb222ab Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug23985| 9 + src/or/routerlist.c | 5 + 2 files changed, 14

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-12-11 Thread nickm
commit 736e7299ce04bd96aa75c50f7dd7ecba36945917 Merge: f7b41bcdf 7fcb222ab Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23985| 9 + src/or/routerlist.c | 5 + 2 files changed, 14

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

2017-12-11 Thread nickm
commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9 Merge: c55a05423 7e486dd6f Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23985| 9 + src/or/routerlist.c | 5 + 2 files changed, 14

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

2017-12-11 Thread nickm
commit a14ff6b9c71ee4891b9c992821a63d2df09fcd38 Merge: d77e82769 e553bf3ce Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 ___ tor-commits mailing list

[tor-commits] [tor/release-0.3.1] Don't delay descriptor fetches when missing info needed for circuits

2017-12-11 Thread nickm
commit 0dc55fb24756c5ae80e71f6fce93d97d73efd2fc Author: Nick Mathewson Date: Wed Nov 8 13:22:16 2017 -0500 Don't delay descriptor fetches when missing info needed for circuits When we have fewer than 15 descriptors to fetch, we will delay the fetch for a

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

2017-12-11 Thread nickm
commit b63cbec65e33602af5ba3e310b87fddb4ad75ab5 Merge: 74ce41d4d 736e7299c Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23985| 9 + src/or/routerlist.c | 5 + 2 files changed, 14

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-12-11 Thread nickm
commit 736e7299ce04bd96aa75c50f7dd7ecba36945917 Merge: f7b41bcdf 7fcb222ab Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23985| 9 + src/or/routerlist.c | 5 + 2 files changed, 14

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

2017-12-11 Thread nickm
commit e553bf3ce4b68a752f5f75c9f2e78cfc45c68f2a Merge: bfc9be4c7 736e7299c Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ tor-commits mailing list

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

2017-12-11 Thread nickm
commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9 Merge: c55a05423 7e486dd6f Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23985| 9 + src/or/routerlist.c | 5 + 2 files changed, 14

[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

2017-12-11 Thread nickm
commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12 Merge: 953a8f851 0dc55fb24 Author: Nick Mathewson Date: Mon Dec 11 16:51:54 2017 -0500 Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9 changes/bug23985| 9 + src/or/routerlist.c | 5

[tor-commits] [tor/maint-0.3.0] Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

2017-12-11 Thread nickm
commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12 Merge: 953a8f851 0dc55fb24 Author: Nick Mathewson Date: Mon Dec 11 16:51:54 2017 -0500 Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9 changes/bug23985| 9 + src/or/routerlist.c | 5

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

2017-12-11 Thread nickm
commit e553bf3ce4b68a752f5f75c9f2e78cfc45c68f2a Merge: bfc9be4c7 736e7299c Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ tor-commits mailing list

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

2017-12-11 Thread nickm
commit 3ccd1c0da7de19e0c61edf0180955b50588b8524 Merge: 6abdc77c3 7e486dd6f Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug23985| 9 + src/or/routerlist.c | 5 + 2 files changed, 14

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

2017-12-11 Thread nickm
commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9 Merge: c55a05423 7e486dd6f Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23985| 9 + src/or/routerlist.c | 5 + 2 files changed, 14

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

2017-12-11 Thread nickm
commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9 Merge: c55a05423 7e486dd6f Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23985| 9 + src/or/routerlist.c | 5 + 2 files changed, 14

[tor-commits] [tor/release-0.3.0] Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

2017-12-11 Thread nickm
commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12 Merge: 953a8f851 0dc55fb24 Author: Nick Mathewson Date: Mon Dec 11 16:51:54 2017 -0500 Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9 changes/bug23985| 9 + src/or/routerlist.c | 5

[tor-commits] [tor/release-0.3.0] Don't delay descriptor fetches when missing info needed for circuits

2017-12-11 Thread nickm
commit 0dc55fb24756c5ae80e71f6fce93d97d73efd2fc Author: Nick Mathewson Date: Wed Nov 8 13:22:16 2017 -0500 Don't delay descriptor fetches when missing info needed for circuits When we have fewer than 15 descriptors to fetch, we will delay the fetch for a

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

2017-12-11 Thread nickm
commit 736e7299ce04bd96aa75c50f7dd7ecba36945917 Merge: f7b41bcdf 7fcb222ab Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23985| 9 + src/or/routerlist.c | 5 + 2 files changed, 14

[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

2017-12-11 Thread nickm
commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12 Merge: 953a8f851 0dc55fb24 Author: Nick Mathewson Date: Mon Dec 11 16:51:54 2017 -0500 Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9 changes/bug23985| 9 + src/or/routerlist.c | 5

[tor-commits] [tor/maint-0.3.0] Don't delay descriptor fetches when missing info needed for circuits

2017-12-11 Thread nickm
commit 0dc55fb24756c5ae80e71f6fce93d97d73efd2fc Author: Nick Mathewson Date: Wed Nov 8 13:22:16 2017 -0500 Don't delay descriptor fetches when missing info needed for circuits When we have fewer than 15 descriptors to fetch, we will delay the fetch for a

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

2017-12-11 Thread nickm
commit 16ec4da68c1e683d713b29f0408f504dbe635116 Merge: abcc7032c e553bf3ce Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-12-11 Thread nickm
commit 736e7299ce04bd96aa75c50f7dd7ecba36945917 Merge: f7b41bcdf 7fcb222ab Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23985| 9 + src/or/routerlist.c | 5 + 2 files changed, 14

[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

2017-12-11 Thread nickm
commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12 Merge: 953a8f851 0dc55fb24 Author: Nick Mathewson Date: Mon Dec 11 16:51:54 2017 -0500 Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9 changes/bug23985| 9 + src/or/routerlist.c | 5

[tor-commits] [tor/maint-0.3.1] Don't delay descriptor fetches when missing info needed for circuits

2017-12-11 Thread nickm
commit 0dc55fb24756c5ae80e71f6fce93d97d73efd2fc Author: Nick Mathewson Date: Wed Nov 8 13:22:16 2017 -0500 Don't delay descriptor fetches when missing info needed for circuits When we have fewer than 15 descriptors to fetch, we will delay the fetch for a

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

2017-12-11 Thread nickm
commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12 Merge: 953a8f851 0dc55fb24 Author: Nick Mathewson Date: Mon Dec 11 16:51:54 2017 -0500 Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9 changes/bug23985| 9 + src/or/routerlist.c | 5

[tor-commits] [tor/release-0.2.9] Don't delay descriptor fetches when missing info needed for circuits

2017-12-11 Thread nickm
commit 0dc55fb24756c5ae80e71f6fce93d97d73efd2fc Author: Nick Mathewson Date: Wed Nov 8 13:22:16 2017 -0500 Don't delay descriptor fetches when missing info needed for circuits When we have fewer than 15 descriptors to fetch, we will delay the fetch for a

  1   2   3   >