[tor-commits] [torbirdy/master] Fix indentation in feedwizard.js

2016-05-11 Thread sukhbir
commit 405564bc67868489607fab60c7e66beaa5f4ce00 Author: Sukhbir Singh Date: Wed May 11 21:49:54 2016 -0400 Fix indentation in feedwizard.js --- chrome/content/feedwizard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[tor-commits] [torbirdy/master] Add overlay to disable automatic checking and fetching of RSS feeds (#19031)

2016-05-11 Thread sukhbir
commit 0968621f307da8a9a0fcf6de9b30fb757169ccfe Author: Sukhbir Singh Date: Wed May 11 21:32:14 2016 -0400 Add overlay to disable automatic checking and fetching of RSS feeds (#19031) To disable checking of new articles on startup and after a fixed interval

[tor-commits] [torbirdy/master] Disable HTML for RSS feeds

2016-05-11 Thread sukhbir
commit 174cd106b9708d22c9825d6611b13d1f22d7397a Author: Sukhbir Singh Date: Wed May 11 15:34:48 2016 -0400 Disable HTML for RSS feeds --- components/torbirdy.js | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/torbirdy.js

[tor-commits] [tor-browser/tor-browser-45.1.0esr-6.0-1] Bug 18995: Regression test to ensure CacheStorage is disabled in private browsing

2016-05-11 Thread gk
commit cea5f1efcd9590885127a0763432143aca01524c Author: Arthur Edelstein Date: Tue May 10 16:51:08 2016 -0700 Bug 18995: Regression test to ensure CacheStorage is disabled in private browsing --- tbb-tests/browser.ini | 5

[tor-commits] [tor/master] fix 'make dist' which was broken by ticket 18365's merge

2016-05-11 Thread arma
commit 9e44273a4a22803eff900f6df10f13c7548bdb0d Author: Roger Dingledine Date: Wed May 11 16:15:37 2016 -0400 fix 'make dist' which was broken by ticket 18365's merge --- src/ext/include.am | 32 1 file changed, 16 insertions(+), 16

[tor-commits] [tor-browser-bundle/hardened-builds] Bug 18915: Use our search plugins in localized builds

2016-05-11 Thread gk
commit 467796a7b7901fc22f26716860ed6ed8d4102416 Author: Georg Koppen Date: Wed May 11 19:37:29 2016 + Bug 18915: Use our search plugins in localized builds We are preparing the language packs we ship for using our search engines in the order we want.

[tor-commits] [tor-browser-bundle/master] Bug 18915: Use our search plugins in localized builds

2016-05-11 Thread gk
commit 94c6a1c73291f8f456249d9719de57ff002fe6fe Author: Georg Koppen Date: Wed May 11 19:37:29 2016 + Bug 18915: Use our search plugins in localized builds We are preparing the language packs we ship for using our search engines in the order we want.

[tor-commits] [tor-browser-bundle/hardened-builds] Bug 18976: Remove some FTE bridges

2016-05-11 Thread gk
commit 076028da65ee8d4785b65f818e7f8c19bf9e3f0b Author: Georg Koppen Date: Mon May 9 07:53:06 2016 + Bug 18976: Remove some FTE bridges --- Bundle-Data/PTConfigs/bridge_prefs.js | 13 - 1 file changed, 4 insertions(+), 9 deletions(-) diff --git

[tor-commits] [tor-browser-bundle/master] Bug 18976: Remove some FTE bridges

2016-05-11 Thread gk
commit bd2d6d501e88599a86b7a55a23f1731c0ec6ed74 Author: Georg Koppen Date: Mon May 9 07:53:06 2016 + Bug 18976: Remove some FTE bridges --- Bundle-Data/PTConfigs/bridge_prefs.js | 13 - 1 file changed, 4 insertions(+), 9 deletions(-) diff --git

[tor-commits] [torspec/master] Merge remote-tracking branch 'public/bug18815'

2016-05-11 Thread nickm
commit 0c5563ae78fef607d4759435c7610806d5d241ad Merge: 3a12deb 5c17e94 Author: Nick Mathewson Date: Wed May 11 14:13:34 2016 -0400 Merge remote-tracking branch 'public/bug18815' dir-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

[tor-commits] [torspec/master] Note #18815 change of UseOptimisticData default.

2016-05-11 Thread nickm
commit 5c17e945cde5fdc51570ce5b0f9843b1db3246be Author: Nick Mathewson Date: Mon Apr 18 13:56:27 2016 -0400 Note #18815 change of UseOptimisticData default. --- dir-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dir-spec.txt

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug18815'

2016-05-11 Thread nickm
commit e3a4511049162b2560b80a70c6c2596fcb34dd34 Merge: 48b7db3 4f37919 Author: Nick Mathewson Date: Wed May 11 14:12:39 2016 -0400 Merge remote-tracking branch 'public/bug18815' changes/bug18815| 3 +++ src/or/circuituse.c | 7 --- 2 files changed, 7

[tor-commits] [tor/master] Change UseOptimisticData default to 1.

2016-05-11 Thread nickm
commit 4f37919fa1fd66daf2913203af3f51be60771fcb Author: Nick Mathewson Date: Mon Apr 18 13:55:23 2016 -0400 Change UseOptimisticData default to 1. This lets us use optimistic data for downloading our initial consensus. Closes ticket 18815. ---

[tor-commits] [translation/tor-launcher-progress] Update translations for tor-launcher-progress

2016-05-11 Thread translation
commit 79e21c585e1de2a5cd07268d7eb382d42f523b1d Author: Translation commit bot Date: Wed May 11 17:45:39 2016 + Update translations for tor-launcher-progress --- br/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2016-05-11 Thread translation
commit 17515029ad0a65252cc323752f84f2b39d329d40 Author: Translation commit bot Date: Wed May 11 17:45:54 2016 + Update translations for torbutton-brandproperties --- br/brand.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

[tor-commits] [translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed

2016-05-11 Thread translation
commit 17b1c481c4a3e7c98a4ac4e160b3cca726d536fd Author: Translation commit bot Date: Wed May 11 17:47:03 2016 + Update translations for tails-onioncircuits_completed --- hu/onioncircuits.pot | 94 1 file

[tor-commits] [translation/tails-onioncircuits] Update translations for tails-onioncircuits

2016-05-11 Thread translation
commit 13c007d1752cb10c944935d4081f3b19e48fc29c Author: Translation commit bot Date: Wed May 11 17:47:00 2016 + Update translations for tails-onioncircuits --- hu/onioncircuits.pot | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-)

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

2016-05-11 Thread translation
commit c867f1c93c6ff671aa7c5c6cfc952f9c122bdb49 Author: Translation commit bot Date: Wed May 11 17:45:59 2016 + Update translations for torbutton-branddtd --- br/brand.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2016-05-11 Thread translation
commit b8e446ceef0c203ca13320d0cea1d2c1fe6c935a Author: Translation commit bot Date: Wed May 11 17:45:50 2016 + Update translations for abouttor-homepage --- br/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/br/aboutTor.dtd

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2016-05-11 Thread translation
commit 6090c5b819ae33cee8708aa6cff82789481efb08 Author: Translation commit bot Date: Wed May 11 17:45:33 2016 + Update translations for mat-gui --- br.po | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/br.po b/br.po index

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2016-05-11 Thread translation
commit 196ba8e83454aff54cf6f71e53c3978048b8b452 Author: Translation commit bot Date: Wed May 11 17:45:46 2016 + Update translations for tails-misc --- br.po | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/br.po b/br.po index

[tor-commits] [tor/master] Add changes file for ticket 16698

2016-05-11 Thread nickm
commit 48b7db35590afee77fb608b46328959e8a9b2d31 Author: Nick Mathewson Date: Wed May 11 13:43:19 2016 -0400 Add changes file for ticket 16698 --- changes/ticket16698 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket16698 b/changes/ticket16698 new

[tor-commits] [tor/master] unbreak the build (when warnings are enabled)

2016-05-11 Thread arma
commit d40e8695f42959d180fe563d447422327535c753 Author: Roger Dingledine Date: Wed May 11 13:42:00 2016 -0400 unbreak the build (when warnings are enabled) --- src/or/dirserv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/dirserv.c

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

2016-05-11 Thread arma
commit 163cee1b6489c8966681b420d6da49e8ff4a9d1f Merge: 8d96223 d40e869 Author: Roger Dingledine Date: Wed May 11 13:42:40 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 src/or/dirserv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

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

2016-05-11 Thread arma
commit ad8b9dcd4713133fe840608e1ea98b09af6bc85a Merge: 60e9e48 163cee1 Author: Roger Dingledine Date: Wed May 11 13:43:06 2016 -0400 Merge branch 'maint-0.2.8' src/or/dirserv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

[tor-commits] [tor/maint-0.2.8] unbreak the build (when warnings are enabled)

2016-05-11 Thread arma
commit d40e8695f42959d180fe563d447422327535c753 Author: Roger Dingledine Date: Wed May 11 13:42:00 2016 -0400 unbreak the build (when warnings are enabled) --- src/or/dirserv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/dirserv.c

[tor-commits] [tor/maint-0.2.7] unbreak the build (when warnings are enabled)

2016-05-11 Thread arma
commit d40e8695f42959d180fe563d447422327535c753 Author: Roger Dingledine Date: Wed May 11 13:42:00 2016 -0400 unbreak the build (when warnings are enabled) --- src/or/dirserv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/dirserv.c

[tor-commits] [tor/master] Merge branch 'ticket16698_v2'

2016-05-11 Thread nickm
commit 60e9e484487b1163bc531b72597ee24741ce4df0 Merge: 00ee62b 03ae44a Author: Nick Mathewson Date: Wed May 11 13:39:38 2016 -0400 Merge branch 'ticket16698_v2' src/or/directory.c | 293 +++-- 1 file changed, 219

[tor-commits] [tor/master] Split directory_handle_command_get into subfunctions.

2016-05-11 Thread nickm
commit 50d777dcf4ca963fff35935f3c171f4c4a27c72e Author: Nick Mathewson Date: Tue May 10 13:48:17 2016 -0400 Split directory_handle_command_get into subfunctions. This was one of our longest functions, at 600 lines. It makes a nice table-driven URL-based

[tor-commits] [tor/master] Fix comment for directory_handle_command_get

2016-05-11 Thread nickm
commit 03ae44a9e83b86a64a8e25164241cbaa0164e8cf Author: Nick Mathewson Date: Wed May 11 13:39:11 2016 -0400 Fix comment for directory_handle_command_get --- src/or/directory.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/directory.c

[tor-commits] [tor/master] Basic work on a publish/subscribe abstraction

2016-05-11 Thread nickm
commit 80a6c8caa3910b18ce50ef870ef0af546c64faa2 Author: Nick Mathewson Date: Thu Mar 24 11:15:19 2016 -0400 Basic work on a publish/subscribe abstraction The goal here is to provide a way to decouple pieces of the code that want to learn "when something

[tor-commits] [tor/master] Merge branch 'pubsub_squashed'

2016-05-11 Thread nickm
commit 00ee62b8a55a81518458f99f822c4147e121a4d3 Merge: 3c6f059 80a6c8c Author: Nick Mathewson Date: Wed May 11 13:26:29 2016 -0400 Merge branch 'pubsub_squashed' src/common/include.am | 2 + src/common/pubsub.c| 129 +++

[tor-commits] [tor/master] Merge remote-tracking branch 'arma/feature18760'

2016-05-11 Thread nickm
commit 3c6f059e6aa5e4b7937f364cc0101229b6386818 Merge: e9e6a1f 0aacc07 Author: Nick Mathewson Date: Wed May 11 13:22:31 2016 -0400 Merge remote-tracking branch 'arma/feature18760' changes/feature18760 | 6 ++ src/or/dirserv.c | 4 ++-- 2 files changed, 8

[tor-commits] [tor/master] encourage rejected relays to contact us

2016-05-11 Thread nickm
commit 0aacc070369d7f9614de9132b2f9e567b96a20bf Author: Roger Dingledine Date: Tue Apr 12 19:54:04 2016 -0400 encourage rejected relays to contact us When the directory authorities refuse a bad relay's descriptor, encourage the relay operator to contact

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

2016-05-11 Thread nickm
commit e9e6a1f54781bab186e8c107c2e496d7786ab096 Merge: 022d322 8d96223 Author: Nick Mathewson Date: Wed May 11 13:20:57 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18816| 2 -- src/or/routerlist.c | 16 ++-- 2 files changed, 6 insertions(+), 12

[tor-commits] [tor/maint-0.2.8] Confim we want certificates from fallbacks

2016-05-11 Thread nickm
commit 797ece042d9666beae3ffc801b148e8bebcd88c0 Author: teor (Tim Wilson-Brown) Date: Wed May 11 13:08:45 2016 -0400 Confim we want certificates from fallbacks Comment-only change --- src/or/routerlist.c | 6 -- 1 file changed, 4 insertions(+), 2

[tor-commits] [tor/maint-0.2.8] Revert "Switch between fallback and authority when auth cert fetch fails"

2016-05-11 Thread nickm
commit 2cbad2aac76d911cce7cee95e91aebc1b1fcb509 Author: teor (Tim Wilson-Brown) Date: Wed May 11 13:06:13 2016 -0400 Revert "Switch between fallback and authority when auth cert fetch fails" This reverts commit 92d7ee08b8c51b4b29f68c6d00ca4aa91ea5a66b. ---

[tor-commits] [tor/maint-0.2.8] Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8

2016-05-11 Thread nickm
commit 8d962233f65022dc7fbc0466c981e3e7f2aea0c8 Merge: 24fbb9a 797ece0 Author: Nick Mathewson Date: Wed May 11 13:20:51 2016 -0400 Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8 changes/bug18816| 2 -- src/or/routerlist.c | 16

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8

2016-05-11 Thread nickm
commit 8d962233f65022dc7fbc0466c981e3e7f2aea0c8 Merge: 24fbb9a 797ece0 Author: Nick Mathewson Date: Wed May 11 13:20:51 2016 -0400 Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8 changes/bug18816| 2 -- src/or/routerlist.c | 16

[tor-commits] [tor/master] Revert "Switch between fallback and authority when auth cert fetch fails"

2016-05-11 Thread nickm
commit 2cbad2aac76d911cce7cee95e91aebc1b1fcb509 Author: teor (Tim Wilson-Brown) Date: Wed May 11 13:06:13 2016 -0400 Revert "Switch between fallback and authority when auth cert fetch fails" This reverts commit 92d7ee08b8c51b4b29f68c6d00ca4aa91ea5a66b. ---

[tor-commits] [tor/master] Confim we want certificates from fallbacks

2016-05-11 Thread nickm
commit 797ece042d9666beae3ffc801b148e8bebcd88c0 Author: teor (Tim Wilson-Brown) Date: Wed May 11 13:08:45 2016 -0400 Confim we want certificates from fallbacks Comment-only change --- src/or/routerlist.c | 6 -- 1 file changed, 4 insertions(+), 2

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

2016-05-11 Thread nickm
commit 24fbb9a81b19cc20df9a204d3203d1b914fb267d Merge: 28e1aa1 4e94580 Author: Nick Mathewson Date: Wed May 11 13:15:17 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/bug19032 | 4 src/or/dirserv.c | 31

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

2016-05-11 Thread nickm
commit 24fbb9a81b19cc20df9a204d3203d1b914fb267d Merge: 28e1aa1 4e94580 Author: Nick Mathewson Date: Wed May 11 13:15:17 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/bug19032 | 4 src/or/dirserv.c | 31

[tor-commits] [tor/master] Fix out-of-bounds write during voting with duplicate ed25519 keys

2016-05-11 Thread nickm
commit bf3e32a45288b64e5535e02f40bd2bcb93c8a520 Author: John Brooks Date: Wed May 11 12:13:22 2016 -0400 Fix out-of-bounds write during voting with duplicate ed25519 keys In dirserv_compute_performance_thresholds, we allocate arrays based on the length

[tor-commits] [tor/master] Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7

2016-05-11 Thread nickm
commit 4e94580591da579e53461aeedfb1340836427c02 Merge: 039fc84 bf3e32a Author: Nick Mathewson Date: Wed May 11 13:13:23 2016 -0400 Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7 changes/bug19032 | 4 src/or/dirserv.c | 31

[tor-commits] [tor/maint-0.2.8] Fix out-of-bounds write during voting with duplicate ed25519 keys

2016-05-11 Thread nickm
commit bf3e32a45288b64e5535e02f40bd2bcb93c8a520 Author: John Brooks Date: Wed May 11 12:13:22 2016 -0400 Fix out-of-bounds write during voting with duplicate ed25519 keys In dirserv_compute_performance_thresholds, we allocate arrays based on the length

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

2016-05-11 Thread nickm
commit 022d32252a34fc881d2f9ed661d659b752b83c34 Merge: 71267be 24fbb9a Author: Nick Mathewson Date: Wed May 11 13:17:02 2016 -0400 Merge branch 'maint-0.2.8' changes/bug19032 | 4 src/or/dirserv.c | 31 ---

[tor-commits] [tor/maint-0.2.7] Fix out-of-bounds write during voting with duplicate ed25519 keys

2016-05-11 Thread nickm
commit bf3e32a45288b64e5535e02f40bd2bcb93c8a520 Author: John Brooks Date: Wed May 11 12:13:22 2016 -0400 Fix out-of-bounds write during voting with duplicate ed25519 keys In dirserv_compute_performance_thresholds, we allocate arrays based on the length

[tor-commits] [tor/maint-0.2.8] Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7

2016-05-11 Thread nickm
commit 4e94580591da579e53461aeedfb1340836427c02 Merge: 039fc84 bf3e32a Author: Nick Mathewson Date: Wed May 11 13:13:23 2016 -0400 Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7 changes/bug19032 | 4 src/or/dirserv.c | 31

[tor-commits] [tor/maint-0.2.7] Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7

2016-05-11 Thread nickm
commit 4e94580591da579e53461aeedfb1340836427c02 Merge: 039fc84 bf3e32a Author: Nick Mathewson Date: Wed May 11 13:13:23 2016 -0400 Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7 changes/bug19032 | 4 src/or/dirserv.c | 31

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

2016-05-11 Thread translation
commit dec09614b2f0affeb24792d628ff09d65dc19b92 Author: Translation commit bot Date: Wed May 11 17:16:38 2016 + Update translations for tor-messenger-privdtd --- br/priv.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/br/priv.dtd b/br/priv.dtd new

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

2016-05-11 Thread translation
commit a488dbca56ea7ab36e65c6ce33202a403e53d216 Author: Translation commit bot Date: Wed May 11 16:45:20 2016 + Update translations for https_everywhere_completed --- ca/ssl-observatory.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

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

2016-05-11 Thread translation
commit 6aaa57f329cc64630cb950c275d71803eba8d99a Author: Translation commit bot Date: Wed May 11 16:45:16 2016 + Update translations for https_everywhere --- ca/ssl-observatory.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

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

2016-05-11 Thread nickm
commit 71267bef4c64b791346f8cdd54f3be4cc3fc38ca Merge: 79f9e63 28e1aa1 Author: Nick Mathewson Date: Wed May 11 12:36:55 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18761 | 3 +++ src/or/rendservice.c | 15 ++- 2 files changed, 13 insertions(+),

[tor-commits] [tor/maint-0.2.8] Log find_rp_for_intro_() failures at LOG_PROTOCOL_WARN.

2016-05-11 Thread nickm
commit b59d79134e1089d310278a70788401835c1e5c10 Author: Nick Mathewson Date: Tue Apr 26 20:46:44 2016 -0400 Log find_rp_for_intro_() failures at LOG_PROTOCOL_WARN. Closes ticket 18761. Also fix a whitespace issue. --- changes/bug18761 | 3 +++

[tor-commits] [tor/master] Log find_rp_for_intro_() failures at LOG_PROTOCOL_WARN.

2016-05-11 Thread nickm
commit b59d79134e1089d310278a70788401835c1e5c10 Author: Nick Mathewson Date: Tue Apr 26 20:46:44 2016 -0400 Log find_rp_for_intro_() failures at LOG_PROTOCOL_WARN. Closes ticket 18761. Also fix a whitespace issue. --- changes/bug18761 | 3 +++

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

2016-05-11 Thread nickm
commit 28e1aa111803bc3548e00503ab56de5f3d41c7fc Merge: e71dfb6 b59d791 Author: Nick Mathewson Date: Wed May 11 12:36:27 2016 -0400 Merge branch 'bug18761_028_squashed' into maint-0.2.8 changes/bug18761 | 3 +++ src/or/rendservice.c | 15 ++- 2 files

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

2016-05-11 Thread nickm
commit 28e1aa111803bc3548e00503ab56de5f3d41c7fc Merge: e71dfb6 b59d791 Author: Nick Mathewson Date: Wed May 11 12:36:27 2016 -0400 Merge branch 'bug18761_028_squashed' into maint-0.2.8 changes/bug18761 | 3 +++ src/or/rendservice.c | 15 ++- 2 files

[tor-commits] [tor/master] Switch between fallback and authority when auth cert fetch fails

2016-05-11 Thread nickm
commit 92d7ee08b8c51b4b29f68c6d00ca4aa91ea5a66b Author: teor (Tim Wilson-Brown) Date: Wed May 4 15:41:37 2016 +1000 Switch between fallback and authority when auth cert fetch fails --- changes/bug18816| 2 ++ src/or/routerlist.c | 14 ++ 2 files

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

2016-05-11 Thread nickm
commit 79f9e63ebf2bbe855af381cb49d5fbeb47ec0880 Merge: e31980f e71dfb6 Author: Nick Mathewson Date: Wed May 11 12:30:18 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18816| 6 ++ src/or/routerlist.c | 35 +-- 2 files

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug18816-squashed' into maint-0.2.8

2016-05-11 Thread nickm
commit e71dfb6344c0480523a1fef0a77bd3d270d62e26 Merge: 50249c7 92d7ee0 Author: Nick Mathewson Date: Wed May 11 12:28:37 2016 -0400 Merge remote-tracking branch 'teor/bug18816-squashed' into maint-0.2.8 changes/bug18816| 6 ++ src/or/routerlist.c | 35

[tor-commits] [tor/maint-0.2.7] Undefine _FORTIFY_SOURCE before defining it.

2016-05-11 Thread nickm
commit c662bef45595e40106becfbdbb39811300d15a7f Author: Nick Mathewson Date: Wed May 11 12:15:37 2016 -0400 Undefine _FORTIFY_SOURCE before defining it. This makes our compilation options checks in autoconf work better on systems that already define

[tor-commits] [tor/master] Use the consensus download schedule for authority certificates

2016-05-11 Thread nickm
commit 64b948f5fa0099ddabcf0c63e437cc8e7373ef38 Author: teor (Tim Wilson-Brown) Date: Wed May 4 13:05:18 2016 +1000 Use the consensus download schedule for authority certificates Previously, we were using the generic schedule for some downloads, and the

[tor-commits] [tor/maint-0.2.8] Merge remote-tracking branch 'teor/bug18816-squashed' into maint-0.2.8

2016-05-11 Thread nickm
commit e71dfb6344c0480523a1fef0a77bd3d270d62e26 Merge: 50249c7 92d7ee0 Author: Nick Mathewson Date: Wed May 11 12:28:37 2016 -0400 Merge remote-tracking branch 'teor/bug18816-squashed' into maint-0.2.8 changes/bug18816| 6 ++ src/or/routerlist.c | 35

[tor-commits] [tor/maint-0.2.8] Switch between fallback and authority when auth cert fetch fails

2016-05-11 Thread nickm
commit 92d7ee08b8c51b4b29f68c6d00ca4aa91ea5a66b Author: teor (Tim Wilson-Brown) Date: Wed May 4 15:41:37 2016 +1000 Switch between fallback and authority when auth cert fetch fails --- changes/bug18816| 2 ++ src/or/routerlist.c | 14 ++ 2 files

[tor-commits] [tor/maint-0.2.8] Use the consensus download schedule for authority certificates

2016-05-11 Thread nickm
commit 64b948f5fa0099ddabcf0c63e437cc8e7373ef38 Author: teor (Tim Wilson-Brown) Date: Wed May 4 13:05:18 2016 +1000 Use the consensus download schedule for authority certificates Previously, we were using the generic schedule for some downloads, and the

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

2016-05-11 Thread nickm
commit 50249c7cd97c982fe829a9e7a22e660658b4e217 Merge: 5cd5979 039fc84 Author: Nick Mathewson Date: Wed May 11 12:23:20 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/bug18841.1 | 7 +++ configure.ac | 2 +- 2 files changed, 8

[tor-commits] [tor/master] Merge branch 'bug18841_1_025' into maint-0.2.7

2016-05-11 Thread nickm
commit 039fc8427a512efce87b7bd21c10c4adca4ba30d Merge: 61c0bae c662bef Author: Nick Mathewson Date: Wed May 11 12:22:36 2016 -0400 Merge branch 'bug18841_1_025' into maint-0.2.7 changes/bug18841.1 | 7 +++ configure.ac | 2 +- 2 files changed, 8

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

2016-05-11 Thread nickm
commit e31980f693b569541aded815a504eb62a76649d9 Merge: 84af12e 50249c7 Author: Nick Mathewson Date: Wed May 11 12:23:40 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18841.1 | 7 +++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

[tor-commits] [tor/maint-0.2.7] Merge branch 'bug18841_1_025' into maint-0.2.7

2016-05-11 Thread nickm
commit 039fc8427a512efce87b7bd21c10c4adca4ba30d Merge: 61c0bae c662bef Author: Nick Mathewson Date: Wed May 11 12:22:36 2016 -0400 Merge branch 'bug18841_1_025' into maint-0.2.7 changes/bug18841.1 | 7 +++ configure.ac | 2 +- 2 files changed, 8

[tor-commits] [tor/master] Undefine _FORTIFY_SOURCE before defining it.

2016-05-11 Thread nickm
commit c662bef45595e40106becfbdbb39811300d15a7f Author: Nick Mathewson Date: Wed May 11 12:15:37 2016 -0400 Undefine _FORTIFY_SOURCE before defining it. This makes our compilation options checks in autoconf work better on systems that already define

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

2016-05-11 Thread nickm
commit 039fc8427a512efce87b7bd21c10c4adca4ba30d Merge: 61c0bae c662bef Author: Nick Mathewson Date: Wed May 11 12:22:36 2016 -0400 Merge branch 'bug18841_1_025' into maint-0.2.7 changes/bug18841.1 | 7 +++ configure.ac | 2 +- 2 files changed, 8

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

2016-05-11 Thread nickm
commit 50249c7cd97c982fe829a9e7a22e660658b4e217 Merge: 5cd5979 039fc84 Author: Nick Mathewson Date: Wed May 11 12:23:20 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/bug18841.1 | 7 +++ configure.ac | 2 +- 2 files changed, 8

[tor-commits] [tor/maint-0.2.8] Undefine _FORTIFY_SOURCE before defining it.

2016-05-11 Thread nickm
commit c662bef45595e40106becfbdbb39811300d15a7f Author: Nick Mathewson Date: Wed May 11 12:15:37 2016 -0400 Undefine _FORTIFY_SOURCE before defining it. This makes our compilation options checks in autoconf work better on systems that already define

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

2016-05-11 Thread translation
commit e0da985eac51245f033a7b10eee0a09e43f79946 Author: Translation commit bot Date: Wed May 11 16:15:20 2016 + Update translations for https_everywhere_completed --- ca/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2016-05-11 Thread translation
commit b39fc53839777fdcf6b6eb0bd1a4c2544d59f769 Author: Translation commit bot Date: Wed May 11 16:15:16 2016 + Update translations for https_everywhere --- ca/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2016-05-11 Thread translation
commit 290753bea26e3c1154f6ad14b2817bcec41a1a21 Author: Translation commit bot Date: Wed May 11 15:45:44 2016 + Update translations for abouttor-homepage --- ca/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/aboutTor.dtd

[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2016-05-11 Thread translation
commit c8cd4e5730dddf414ce85df2ec9c95fc2bf29a3d Author: Translation commit bot Date: Wed May 11 15:45:49 2016 + Update translations for abouttor-homepage_completed --- ca/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [snowflake/master] Return after bad request

2016-05-11 Thread arlo
commit bdbabe5e0c0cdc651a8c23262759074625d9d554 Author: Arlo Breault Date: Wed May 11 07:27:42 2016 -0700 Return after bad request --- broker/broker.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2016-05-11 Thread translation
commit a31c0f4b92d3b9560af19a1a304ef19c3b412bd7 Author: Translation commit bot Date: Wed May 11 14:15:39 2016 + Update translations for tor-launcher-network-settings --- es_AR/network-settings.dtd | 22 +++--- 1 file changed, 11

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2016-05-11 Thread translation
commit 2994218b28d2e3b0b3cca3e93ecbed9d3c1faee4 Author: Translation commit bot Date: Wed May 11 13:45:44 2016 + Update translations for tails-misc --- es_AR.po | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/es_AR.po

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2016-05-11 Thread translation
commit 5cc034646e8f7bec23a01d690680e447a5153c1b Author: Translation commit bot Date: Wed May 11 13:45:40 2016 + Update translations for tor-launcher-network-settings --- es_AR/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)