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

2017-10-23 Thread nickm
commit 5d37d270075ba64d08d95eb0d5cc0d3473acbdbb Merge: 7a4741c23 d29e4c059 Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list

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

2017-10-23 Thread nickm
commit 68dea082e728094e393ee7629854e5e8ad9bbe32 Merge: 43ebe54a2 f367453cb Author: Nick Mathewson Date: Mon Oct 23 08:46:26 2017 -0400 Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit d29e4c05973d9e371e800a8b0ed5f28fb8f1dc22 Merge: f7f55acae 68dea082e Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit 5d37d270075ba64d08d95eb0d5cc0d3473acbdbb Merge: 7a4741c23 d29e4c059 Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list

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

2017-10-23 Thread nickm
commit 5d37d270075ba64d08d95eb0d5cc0d3473acbdbb Merge: 7a4741c23 d29e4c059 Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list

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

2017-10-23 Thread nickm
commit d29e4c05973d9e371e800a8b0ed5f28fb8f1dc22 Merge: f7f55acae 68dea082e Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit 68dea082e728094e393ee7629854e5e8ad9bbe32 Merge: 43ebe54a2 f367453cb Author: Nick Mathewson Date: Mon Oct 23 08:46:26 2017 -0400 Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit ee3d83dbf7ace00080bfa9c77e0fd236f67d1fa8 Merge: 44019d73f d29e4c059 Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit d29e4c05973d9e371e800a8b0ed5f28fb8f1dc22 Merge: f7f55acae 68dea082e Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit a46288252b28b81bb95dcf94fab53c8fb6e86ffc Merge: 929874908 5d37d2700 Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ tor-commits mailing list

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

2017-10-23 Thread nickm
commit d29e4c05973d9e371e800a8b0ed5f28fb8f1dc22 Merge: f7f55acae 68dea082e Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit 5d37d270075ba64d08d95eb0d5cc0d3473acbdbb Merge: 7a4741c23 d29e4c059 Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list

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

2017-10-23 Thread nickm
commit 68dea082e728094e393ee7629854e5e8ad9bbe32 Merge: 43ebe54a2 f367453cb Author: Nick Mathewson Date: Mon Oct 23 08:46:26 2017 -0400 Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit a46288252b28b81bb95dcf94fab53c8fb6e86ffc Merge: 929874908 5d37d2700 Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ tor-commits mailing list

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

2017-10-23 Thread nickm
commit d29e4c05973d9e371e800a8b0ed5f28fb8f1dc22 Merge: f7f55acae 68dea082e Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit 3bf1d81a1db38f6cbc04fd4b817dd5285ae0d4fe Merge: 4b6ba0967 68dea082e Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit 68dea082e728094e393ee7629854e5e8ad9bbe32 Merge: 43ebe54a2 f367453cb Author: Nick Mathewson Date: Mon Oct 23 08:46:26 2017 -0400 Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9 changes/bug22349 | 9 + src/or/dirserv.c | 56

[tor-commits] [tor/release-0.3.0] Mark descriptors as undownloadable when dirserv_add_() rejects them

2017-10-23 Thread nickm
commit f367453cb5a9ea5cb0d5664425256d7abbcbb407 Author: Nick Mathewson Date: Tue Jun 27 12:01:46 2017 -0400 Mark descriptors as undownloadable when dirserv_add_() rejects them As of ac2f6b608a18a8595f62384788196d7c3f2875fd in 0.2.1.19-alpha, Sebastian

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

2017-10-23 Thread nickm
commit 68dea082e728094e393ee7629854e5e8ad9bbe32 Merge: 43ebe54a2 f367453cb Author: Nick Mathewson Date: Mon Oct 23 08:46:26 2017 -0400 Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9 changes/bug22349 | 9 + src/or/dirserv.c | 56

[tor-commits] [tor/maint-0.3.0] Mark descriptors as undownloadable when dirserv_add_() rejects them

2017-10-23 Thread nickm
commit f367453cb5a9ea5cb0d5664425256d7abbcbb407 Author: Nick Mathewson Date: Tue Jun 27 12:01:46 2017 -0400 Mark descriptors as undownloadable when dirserv_add_() rejects them As of ac2f6b608a18a8595f62384788196d7c3f2875fd in 0.2.1.19-alpha, Sebastian

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

2017-10-23 Thread nickm
commit d29e4c05973d9e371e800a8b0ed5f28fb8f1dc22 Merge: f7f55acae 68dea082e Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit 1949c78237a0dc889c1ab5f9ff02fa18afb8cb58 Merge: 35746a9ee a46288252 Author: Nick Mathewson Date: Mon Oct 23 08:46:30 2017 -0400 Merge branch 'maint-0.3.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.2.9] Mark descriptors as undownloadable when dirserv_add_() rejects them

2017-10-23 Thread nickm
commit f367453cb5a9ea5cb0d5664425256d7abbcbb407 Author: Nick Mathewson Date: Tue Jun 27 12:01:46 2017 -0400 Mark descriptors as undownloadable when dirserv_add_() rejects them As of ac2f6b608a18a8595f62384788196d7c3f2875fd in 0.2.1.19-alpha, Sebastian

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

2017-10-23 Thread nickm
commit 68dea082e728094e393ee7629854e5e8ad9bbe32 Merge: 43ebe54a2 f367453cb Author: Nick Mathewson Date: Mon Oct 23 08:46:26 2017 -0400 Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit 68dea082e728094e393ee7629854e5e8ad9bbe32 Merge: 43ebe54a2 f367453cb Author: Nick Mathewson Date: Mon Oct 23 08:46:26 2017 -0400 Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit 68dea082e728094e393ee7629854e5e8ad9bbe32 Merge: 43ebe54a2 f367453cb Author: Nick Mathewson Date: Mon Oct 23 08:46:26 2017 -0400 Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit d29e4c05973d9e371e800a8b0ed5f28fb8f1dc22 Merge: f7f55acae 68dea082e Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit 68dea082e728094e393ee7629854e5e8ad9bbe32 Merge: 43ebe54a2 f367453cb Author: Nick Mathewson Date: Mon Oct 23 08:46:26 2017 -0400 Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

2017-10-23 Thread nickm
commit 5d37d270075ba64d08d95eb0d5cc0d3473acbdbb Merge: 7a4741c23 d29e4c059 Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list

[tor-commits] [tor/maint-0.2.9] Mark descriptors as undownloadable when dirserv_add_() rejects them

2017-10-23 Thread nickm
commit f367453cb5a9ea5cb0d5664425256d7abbcbb407 Author: Nick Mathewson Date: Tue Jun 27 12:01:46 2017 -0400 Mark descriptors as undownloadable when dirserv_add_() rejects them As of ac2f6b608a18a8595f62384788196d7c3f2875fd in 0.2.1.19-alpha, Sebastian

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2017-10-23 Thread translation
commit 82f3504c6f9c6815bf57008cffd955bdd4bc4718 Author: Translation commit bot Date: Mon Oct 23 11:45:42 2017 + Update translations for https_everywhere --- th/https-everywhere.dtd | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-)

[tor-commits] [torbutton/master] Update locales with translated banner

2017-10-23 Thread gk
commit 7ed85fa7a7097c96b2ed1bcd1cb6181f41f58aac Author: Georg Koppen Date: Mon Oct 23 06:04:39 2017 + Update locales with translated banner --- src/modules/donation-banner.js | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git

[tor-commits] [torbutton/master] Translations update

2017-10-23 Thread gk
commit b35a3e2faab4e73321c336c081d7248138937daa Author: Georg Koppen Date: Mon Oct 23 05:48:34 2017 + Translations update --- src/chrome/locale/fa/aboutTor.properties | 14 +++--- src/chrome/locale/fa/torbutton.dtd| 2 +-

[tor-commits] [torbutton/master] Bug 23949: Fix bug in donation banner that prevented display

2017-10-23 Thread gk
commit 5feba9668e9d8ec7098d605a1442820282779960 Author: Arthur Edelstein Date: Sun Oct 22 18:19:33 2017 -0700 Bug 23949: Fix bug in donation banner that prevented display --- src/modules/donation-banner.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

[tor-commits] [tor-browser-bundle/maint-7.0] Release preparations for 7.0.8

2017-10-23 Thread gk
commit 0f57cc689ea49c86fa4077abe0e97fe1a18cf509 Author: Georg Koppen Date: Mon Oct 23 06:13:39 2017 + Release preparations for 7.0.8 Torbutton version bump, CHANGELOG update, and config.yml updates --- Bundle-Data/Docs/ChangeLog.txt| 7 +++

[tor-commits] [torbutton/maint-1.9.7] Bug 23949: Fix bug in donation banner that prevented display

2017-10-23 Thread gk
commit f58bab3851c28fbb8145552349bfdaf62ee1054e Author: Arthur Edelstein Date: Sun Oct 22 18:19:33 2017 -0700 Bug 23949: Fix bug in donation banner that prevented display --- src/modules/donation-banner.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

[tor-commits] [torbutton/maint-1.9.7] Release preparations for 1.9.7.9

2017-10-23 Thread gk
commit 262435740fcbdea4d65bbe830f32ca1f8ebdbe99 Author: Georg Koppen Date: Mon Oct 23 06:05:56 2017 + Release preparations for 1.9.7.9 CHANGELOG update, version bump --- src/CHANGELOG | 5 + src/install.rdf | 2 +- 2 files changed, 6 insertions(+),

[tor-commits] [torbutton/maint-1.9.7] Update locales with translated banner

2017-10-23 Thread gk
commit e8705e5050b061062744569d5ff8efdbb035541e Author: Georg Koppen Date: Mon Oct 23 06:04:39 2017 + Update locales with translated banner --- src/modules/donation-banner.js | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git

[tor-commits] [torbutton/maint-1.9.7] Translations update

2017-10-23 Thread gk
commit 9c2dbede4221056824013d0c284b66c476fba748 Author: Georg Koppen Date: Mon Oct 23 05:48:34 2017 + Translations update --- src/chrome/locale/fa/aboutTor.properties | 14 +++--- src/chrome/locale/fa/torbutton.dtd| 2 +-

<    1   2   3   4