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

2015-07-10 Thread translation
commit ba078b815826b1a22de5fd73aba14abf37c61570 Author: Translation commit bot translat...@torproject.org Date: Fri Jul 10 06:45:43 2015 + Update translations for mat-gui --- de.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de.po b/de.po index

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

2015-07-10 Thread translation
commit 7be505b1aa4b2181b38c950a98c19bca30d89281 Author: Translation commit bot translat...@torproject.org Date: Fri Jul 10 06:45:48 2015 + Update translations for mat-gui_completed --- de.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de.po b/de.po index

[tor-commits] [tor-messenger-build/master] Block all plugins from Tor Messenger (closes #16475)

2015-07-10 Thread sukhbir
commit 147fb0aa31550c09c0c8498e7e7cedac3e0e84eb Author: Sukhbir Singh sukh...@torproject.org Date: Fri Jul 10 03:40:43 2015 -0400 Block all plugins from Tor Messenger (closes #16475) This fix is borrowed from Mike Perry's patch for Tor Browser, but additionally, we also block

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

2015-07-10 Thread translation
commit d434472ae605b442b9e32a7932020915eaa87462 Author: Translation commit bot translat...@torproject.org Date: Fri Jul 10 09:45:03 2015 + Update translations for bridgedb --- sr/LC_MESSAGES/bridgedb.po | 26 +- 1 file changed, 13 insertions(+), 13

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

2015-07-10 Thread translation
commit b60e164b205344a8e76c032d8901530c81d71780 Author: Translation commit bot translat...@torproject.org Date: Fri Jul 10 09:45:35 2015 + Update translations for tails-greeter --- sr/sr.po |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sr/sr.po

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

2015-07-10 Thread translation
commit 8485af2267017febcff5e8e3058ec380b3ab5ae5 Author: Translation commit bot translat...@torproject.org Date: Fri Jul 10 09:45:09 2015 + Update translations for bridgedb_completed --- sr/LC_MESSAGES/bridgedb.po | 383 1 file changed, 383

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

2015-07-10 Thread translation
commit 75e11293180edf6dbbab9ed53e0e886f8795bc9e Author: Translation commit bot translat...@torproject.org Date: Fri Jul 10 09:46:00 2015 + Update translations for abouttor-homepage_completed --- sr/aboutTor.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2015-07-10 Thread translation
commit 6f8f82f4aedce02f3a3dbb35f00fce43cc13c7dc Author: Translation commit bot translat...@torproject.org Date: Fri Jul 10 09:45:30 2015 + Update translations for tails-persistence-setup --- sr/sr.po | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git

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

2015-07-10 Thread translation
commit 77cc647e1d8a61cb35798d41db3e8f0f7572beae Author: Translation commit bot translat...@torproject.org Date: Fri Jul 10 09:46:22 2015 + Update translations for tor_animation --- sr.srt | 62 +++--- 1 file changed, 31

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

2015-07-10 Thread translation
commit 64f8a65aca8fad1a3ed5be3ff4a0f03900228c04 Author: Translation commit bot translat...@torproject.org Date: Fri Jul 10 09:45:51 2015 + Update translations for tor-launcher-network-settings --- sr/network-settings.dtd |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

[tor-commits] [tor-messenger-build/master] Remove cert_override entries for hidden services pending #13855

2015-07-10 Thread sukhbir
commit c00e29aa5c84717327ede78abd40de16d42f189b Author: Sukhbir Singh sukh...@torproject.org Date: Fri Jul 10 08:56:58 2015 -0400 Remove cert_override entries for hidden services pending #13855 --- projects/instantbird/cert_override.txt |2 -- 1 file changed, 2 deletions(-) diff --git

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

2015-07-10 Thread translation
commit e90604ea56ead825075b81cb69be1c8303621825 Author: Translation commit bot translat...@torproject.org Date: Fri Jul 10 10:15:55 2015 + Update translations for torbutton-torbuttonproperties --- sr/torbutton.properties | 14 +++--- 1 file changed, 7 insertions(+), 7

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4

2015-07-10 Thread nickm
commit fde4199e1caa094965da0904955ad34748db1e30 Merge: cb8c5c0 08e14e1 Author: Nick Mathewson ni...@torproject.org Date: Thu Jun 25 11:42:47 2015 -0400 Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4 changes/geoip6-june2015 |3 + src/config/geoip6 | 2282

[tor-commits] [tor-messenger-build/master] Remove the Records groupbox from the preferences window

2015-07-10 Thread sukhbir
commit c0e14578b8d3f93ca235d54dfc7fda005beac63e Author: Sukhbir Singh sukh...@torproject.org Date: Fri Jul 10 11:42:32 2015 -0400 Remove the Records groupbox from the preferences window We don't want users enabling the logging of conversations by mistake so we remove the

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

2015-07-10 Thread nickm
commit 2cdef2bb3417b4561559d7dab46165c220405c78 Merge: 23a9598 418b6f8 Author: Nick Mathewson ni...@torproject.org Date: Fri Jul 10 11:54:49 2015 -0400 Merge branch 'maint-0.2.6' into release-0.2.6 changes/geoip-june2015 |3 + changes/geoip6-june2015 |3 + src/config/geoip

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

2015-07-10 Thread nickm
commit 418b6f8197929aaf7c532d68bd7e11aefcacaded Merge: 1c1d71f fd082c3 Author: Nick Mathewson ni...@torproject.org Date: Thu Jun 25 11:43:17 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/geoip-june2015 |3 + changes/geoip6-june2015 |3 +

[tor-commits] [tor/master] Try one more one more time to get tor-ci-windows working

2015-07-10 Thread nickm
commit d18215ed1640b5a7dcbb81588ef5a173a22200f3 Author: Nick Mathewson ni...@torproject.org Date: Fri Jul 10 09:57:22 2015 -0400 Try one more one more time to get tor-ci-windows working Apparently its mingw headers are missing some stuff. --- configure.ac|2 ++

[tor-commits] [tor/master] Attempt yet again to make the tor-ci-windows builder happy

2015-07-10 Thread nickm
commit ad0d1818540f85de7d8c205c70c0201d1c688725 Author: Nick Mathewson ni...@torproject.org Date: Fri Jul 10 09:16:32 2015 -0400 Attempt yet again to make the tor-ci-windows builder happy --- src/common/compat.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2015-07-10 Thread nickm
commit cb8c5c023f0e349f30fd6a539437d76358b8b87a Merge: efae1bc e5907e9 Author: Nick Mathewson ni...@torproject.org Date: Thu Jun 25 11:42:31 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-june2015 |3 + src/config/geoip |14347

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2015-07-10 Thread nickm
commit fd082c394bf392cab0c586313a82d5bb3bbd6139 Merge: 75388f6 fde4199 Author: Nick Mathewson ni...@torproject.org Date: Thu Jun 25 11:43:04 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/geoip-june2015 |3 + changes/geoip6-june2015 |3 +