[tor-commits] [onionoo/master] Split ApplicationFactory into four factories.

2014-08-15 Thread karsten
commit b6b152565fbc24750a930306d66ebecd93c16cf7 Author: Karsten Loesing karsten.loes...@gmx.net Date: Thu Aug 14 16:21:32 2014 +0200 Split ApplicationFactory into four factories. This is to avoid a circular dependency between the docs and the util package. Based on a

[tor-commits] [onionoo/master] fixup! Split ApplicationFactory into four factories.

2014-08-15 Thread karsten
commit 3553cf0e510df1d0a3e3a45352b075a5d9469cfb Author: Karsten Loesing karsten.loes...@gmx.net Date: Fri Aug 15 08:53:20 2014 +0200 fixup! Split ApplicationFactory into four factories. --- .../onionoo/docs/DocumentStoreFactory.java | 18 ++

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

2014-08-15 Thread translation
commit 8c41077f1613673bc3ea844d02e9dbd6af8e50fa Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 10:16:58 2014 + Update translations for tor-launcher-properties_completed --- en/torlauncher.properties |6 +++--- pt/torlauncher.properties |6 +++--- 2

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

2014-08-15 Thread translation
commit 01a1fe42eac92239021724085a5ed975da82d655 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 10:45:03 2014 + Update translations for bridgedb --- de/LC_MESSAGES/bridgedb.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

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

2014-08-15 Thread translation
commit 6be2c0e10ef356f6549c6ceadb42ba4aa7e9e334 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 10:45:08 2014 + Update translations for bridgedb_completed --- de/LC_MESSAGES/bridgedb.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff

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

2014-08-15 Thread translation
commit bdd12c07e9ba53c87fee2fbb16b455eddabe38eb Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 10:45:35 2014 + Update translations for tor-launcher-properties --- de/torlauncher.properties|2 +- uk/torlauncher.properties|6 +++---

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

2014-08-15 Thread translation
commit 4339b72aabf8f70130b54bff6f83ffedb7a3ab5d Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 10:45:45 2014 + Update translations for tor-launcher-network-settings_completed --- uk/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1

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

2014-08-15 Thread translation
commit 37aff496f89506ce5657dc825f9af0aef805deab Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 10:45:38 2014 + Update translations for tor-launcher-properties_completed --- uk/torlauncher.properties|5 +++-- zh_CN/torlauncher.properties |6 +++---

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

2014-08-15 Thread translation
commit 4b6533b2c299412936282acb25b6599e6663d2a8 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 10:45:42 2014 + Update translations for tor-launcher-network-settings --- uk/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

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

2014-08-15 Thread translation
commit 06da283397278ab5b722c049e8173994c1d9000c Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 11:15:09 2014 + Update translations for gettor_completed --- de/gettor.po | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-)

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

2014-08-15 Thread translation
commit 89bb98cff4fea8c1bea50131261ed1a1a664616b Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 11:15:05 2014 + Update translations for gettor --- de/gettor.po | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git

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

2014-08-15 Thread translation
commit 46c882a53f4502cb5ed1715296fa7547fbe17a68 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 11:15:40 2014 + Update translations for tor-launcher-properties_completed --- es/torlauncher.properties|6 +++--- nb/torlauncher.properties|6

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

2014-08-15 Thread translation
commit bdeff8e6d221c5b2d47c87387cfc35b0326354e1 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 11:15:36 2014 + Update translations for tor-launcher-properties --- es/torlauncher.properties|4 ++-- nb/torlauncher.properties|4 ++--

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

2014-08-15 Thread translation
commit 088c29da8ad9cb69daef756a996484181b5adaf3 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 11:45:07 2014 + Update translations for gettor --- de/gettor.po | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git

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

2014-08-15 Thread translation
commit 34dd96e33b0a143a293e549456a9d790370c253b Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 11:45:10 2014 + Update translations for gettor_completed --- de/gettor.po | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff

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

2014-08-15 Thread translation
commit e893c533265ba3fd9adfd8aa4b1fade126b36d52 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 12:15:09 2014 + Update translations for gettor_completed --- de/gettor.po | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff

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

2014-08-15 Thread translation
commit b71bb46a54ff2a7035f7b2b9b0d03891b9474270 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 12:15:04 2014 + Update translations for gettor --- de/gettor.po | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git

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

2014-08-15 Thread translation
commit f53b7f9027a0ec94e142c6203e394c9e62b0f195 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 12:45:51 2014 + Update translations for torbutton-branddtd_completed --- de/brand.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2014-08-15 Thread translation
commit 5941225c42524d916c0c748412aa61b6ed0bf13d Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 12:45:41 2014 + Update translations for abouttor-homepage_completed --- de/aboutTor.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2014-08-15 Thread translation
commit c1aba30e9df87fa43d35e59907c7dd22e96f Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 12:45:46 2014 + Update translations for torbutton-brandproperties_completed --- de/brand.properties |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

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

2014-08-15 Thread translation
commit 77131f6b4ba2c16c14e27af61a14439befefd2c6 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 12:45:37 2014 + Update translations for abouttor-homepage --- de/aboutTor.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2014-08-15 Thread translation
commit cfd5afc93b236b553302dcf4a4e1b1b7e49a8109 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 12:45:44 2014 + Update translations for torbutton-brandproperties --- de/brand.properties |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff

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

2014-08-15 Thread translation
commit 711b4ccbc76725b87e9a7ddaae64f3715b2bd05c Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 12:45:49 2014 + Update translations for torbutton-branddtd --- de/brand.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/brand.dtd

[tor-commits] [tor/master] Documentation fix for policy_summarize().

2014-08-15 Thread nickm
commit 0fc2d0edce7275eb1ff5a5695e3ac26e79550de2 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 08:52:38 2014 -0400 Documentation fix for policy_summarize(). Spotted by epilys --- src/or/policies.c |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff

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

2014-08-15 Thread translation
commit 82aa2983246bfa0c014daa8997ed3bbfb8db8dda Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 13:15:10 2014 + Update translations for torcheck --- de/torcheck.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torcheck.po

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

2014-08-15 Thread translation
commit af98e8765c52dcfced6cdb3e95abc270ce0e600d Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 13:15:13 2014 + Update translations for torcheck_completed --- de/torcheck.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torcheck.po

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

2014-08-15 Thread translation
commit 92ddfa7cfcf6fe451156a992291ae3e81359ee84 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 13:15:36 2014 + Update translations for tor-launcher-properties --- de/torlauncher.properties|2 +- fr_CA/torlauncher.properties |4 ++-- 2 files

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

2014-08-15 Thread translation
commit 54b76ae928d4c650a467ad7a66d88c5344df787b Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 13:15:49 2014 + Update translations for abouttor-homepage_completed --- de/aboutTor.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2014-08-15 Thread translation
commit 1be9da709d9b1cdc96ffc0efaa6d285d2ceb0803 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 13:15:57 2014 + Update translations for torbutton-torbuttonproperties --- de/torbutton.properties | 22 +++--- 1 file changed, 11 insertions(+),

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

2014-08-15 Thread translation
commit 44ed0973440191d53b42629c8fc1ce6ee4e143a5 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 13:15:39 2014 + Update translations for tor-launcher-properties_completed --- de/torlauncher.properties|6 +++--- fr_CA/torlauncher.properties |6

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

2014-08-15 Thread translation
commit 36585fee885d953b1e2019a89359d7d5cea86aa5 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 13:15:47 2014 + Update translations for abouttor-homepage --- de/aboutTor.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2014-08-15 Thread translation
commit 0294218c8d23071282197a80614d1f29da26ed97 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 13:16:00 2014 + Update translations for torbutton-torbuttondtd --- de/torbutton.dtd | 22 +++--- 1 file changed, 11 insertions(+), 11

[tor-commits] [tor/maint-0.2.5] Remove stale printfs from buffer/zlib_fin_at_chunk_end test

2014-08-15 Thread nickm
commit 0cb028b7c0d040e49fa7c8569f71a3e44cdd7d1a Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 09:34:10 2014 -0400 Remove stale printfs from buffer/zlib_fin_at_chunk_end test These got committed by mistake. --- src/test/test_buffers.c |3 --- 1 file changed, 3

[tor-commits] [tor/master] Missing changes file for 3f683aadcd03c311c1

2014-08-15 Thread nickm
commit ff4ba9f8a0efb49af5c804a71dfdd4f39ae85e40 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 10:06:27 2014 -0400 Missing changes file for 3f683aadcd03c311c1 Looks like I forgot to commit this. --- changes/bug12392 |4 1 file changed, 4 insertions(+) diff

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'

2014-08-15 Thread nickm
commit 33fab2846af4079308006354f51343c7f7b4fd4a Merge: ff4ba9f 0cb028b Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 10:07:04 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' src/test/test_buffers.c |3 --- 1 file changed, 3 deletions(-)

[tor-commits] [tor/master] Remove stale printfs from buffer/zlib_fin_at_chunk_end test

2014-08-15 Thread nickm
commit 0cb028b7c0d040e49fa7c8569f71a3e44cdd7d1a Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 09:34:10 2014 -0400 Remove stale printfs from buffer/zlib_fin_at_chunk_end test These got committed by mistake. --- src/test/test_buffers.c |3 --- 1 file changed, 3

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

2014-08-15 Thread translation
commit 2c5277142397d837010ad7ff82759fa9ea26a7f6 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 14:45:29 2014 + Update translations for tor-launcher-properties --- he/torlauncher.properties |8 1 file changed, 4 insertions(+), 4 deletions(-)

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

2014-08-15 Thread translation
commit e569e3027058543ad155d5d51a089a0575c66469 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 14:45:35 2014 + Update translations for tor-launcher-network-settings --- he/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[tor-commits] [tor/master] Add scripts/coccinelle to scripts/README

2014-08-15 Thread nickm
commit be231b0db196513036ee624dc5b9b87c4f898625 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 11:03:15 2014 -0400 Add scripts/coccinelle to scripts/README --- scripts/README |5 + 1 file changed, 5 insertions(+) diff --git a/scripts/README b/scripts/README index

[tor-commits] [doctor/master] Stacktrace when getting suppression durations

2014-08-15 Thread atagar
commit f71c6784e697221d95ab71de6fa4a11d63485a5c Author: Damian Johnson ata...@torproject.org Date: Fri Aug 15 09:27:51 2014 -0700 Stacktrace when getting suppression durations Traceback (most recent call last): File

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

2014-08-15 Thread translation
commit ff00ec8b5cb26b4ce4ff5799863f39afcf5cd302 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 18:45:33 2014 + Update translations for tor-launcher-properties --- tr/torlauncher.properties |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

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

2014-08-15 Thread translation
commit 46fb5cae03bc7cec6f90e6f4edcaed0c07b0fd5a Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 18:45:35 2014 + Update translations for tor-launcher-properties_completed --- tr/torlauncher.properties |6 +++--- 1 file changed, 3 insertions(+), 3

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

2014-08-15 Thread translation
commit f556b0bebea594ae23b58512d2dc46079a373b53 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 20:15:28 2014 + Update translations for tor-launcher-properties --- de/torlauncher.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2014-08-15 Thread translation
commit 6bec6c1e951dbc492dae2d9f17a07a7836133c7b Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 20:15:32 2014 + Update translations for tor-launcher-properties_completed --- de/torlauncher.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2014-08-15 Thread translation
commit 008c66ad05336fbcc42f9ca0187024cd3fc44753 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 20:15:52 2014 + Update translations for torbutton-torbuttondtd --- de/torbutton.dtd | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff

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

2014-08-15 Thread translation
commit 6e1b39868c0c019bfbd9f737901ae07c156a63ef Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 20:45:44 2014 + Update translations for torbutton-torbuttondtd --- de/torbutton.dtd | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff

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

2014-08-15 Thread translation
commit 6e78dbb3d9254bf780d0c1b23e4bad83b0f8f42c Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 21:15:33 2014 + Update translations for tor-launcher-properties --- pt_BR/torlauncher.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

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

2014-08-15 Thread translation
commit 6f8e4b53b72814a4f8ace7f042c0176dd62c26da Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 21:15:38 2014 + Update translations for tor-launcher-properties_completed --- pt_BR/torlauncher.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/maint-0.2.5] Restore functionality for CookieAuthFileGroupReadable.

2014-08-15 Thread nickm
commit 0808ed83f9cf312abe229d0956f0b0132a79962d Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 08:30:44 2014 -0400 Restore functionality for CookieAuthFileGroupReadable. When we merged the cookieauthfile creation logic in 33c3e60a37, we accidentally took out this

[tor-commits] [tor/maint-0.2.5] Merge remote-tracking branch 'asn/nickm-bug12864_025' into maint-0.2.5

2014-08-15 Thread nickm
commit 967b4e7c54b53391e1a0b67e0a5bf70bc2e6a896 Merge: 0cb028b 112c984 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 17:40:13 2014 -0400 Merge remote-tracking branch 'asn/nickm-bug12864_025' into maint-0.2.5 changes/bug12864|7 +++ doc/tor.1.txt |9

[tor-commits] [tor/maint-0.2.5] Documentation fix on arguments to CookieAuthFileGroupReadable

2014-08-15 Thread nickm
commit 0ee1be0c698fa330a2ee2e4f2818e2118f459517 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 08:32:54 2014 -0400 Documentation fix on arguments to CookieAuthFileGroupReadable We don't actually allow a group name, but the documentation implied that we did. ---

[tor-commits] [tor/maint-0.2.5] Some documentation fixes for #12864.

2014-08-15 Thread nickm
commit 112c984f9242699d273f3096d669eb1024d7f64b Author: George Kadianakis desnac...@riseup.net Date: Fri Aug 15 23:12:06 2014 +0300 Some documentation fixes for #12864. --- doc/tor.1.txt |2 +- src/or/config.c |3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Documentation fix on arguments to CookieAuthFileGroupReadable

2014-08-15 Thread nickm
commit 0ee1be0c698fa330a2ee2e4f2818e2118f459517 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 08:32:54 2014 -0400 Documentation fix on arguments to CookieAuthFileGroupReadable We don't actually allow a group name, but the documentation implied that we did. ---

[tor-commits] [tor/master] Restore functionality for CookieAuthFileGroupReadable.

2014-08-15 Thread nickm
commit 0808ed83f9cf312abe229d0956f0b0132a79962d Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 08:30:44 2014 -0400 Restore functionality for CookieAuthFileGroupReadable. When we merged the cookieauthfile creation logic in 33c3e60a37, we accidentally took out this

[tor-commits] [tor/master] Merge remote-tracking branch 'asn/nickm-bug12864_025' into maint-0.2.5

2014-08-15 Thread nickm
commit 967b4e7c54b53391e1a0b67e0a5bf70bc2e6a896 Merge: 0cb028b 112c984 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 17:40:13 2014 -0400 Merge remote-tracking branch 'asn/nickm-bug12864_025' into maint-0.2.5 changes/bug12864|7 +++ doc/tor.1.txt |9

[tor-commits] [tor/master] Some documentation fixes for #12864.

2014-08-15 Thread nickm
commit 112c984f9242699d273f3096d669eb1024d7f64b Author: George Kadianakis desnac...@riseup.net Date: Fri Aug 15 23:12:06 2014 +0300 Some documentation fixes for #12864. --- doc/tor.1.txt |2 +- src/or/config.c |3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'

2014-08-15 Thread nickm
commit 1f35fd0017240a82ae48475a989819aa81a297dc Merge: be231b0 967b4e7 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 17:41:13 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug12864|7 +++ doc/tor.1.txt |9 -

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

2014-08-15 Thread translation
commit 951be3c6f40facaa9afd36328f9d0e6e4bf36cbc Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 21:45:03 2014 + Update translations for bridgedb --- zh_CN/LC_MESSAGES/bridgedb.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

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

2014-08-15 Thread translation
commit a6264327ae1a4d3d1e30083bf6fa5b661a5d41fd Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 21:45:08 2014 + Update translations for bridgedb_completed --- zh_CN/LC_MESSAGES/bridgedb.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

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

2014-08-15 Thread translation
commit 4c7d1aba8cf738b62f4d365c4b380eb569b7ff46 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 21:45:54 2014 + Update translations for torbutton-torbuttondtd --- de/torbutton.dtd|4 ++-- pt_BR/torbutton.dtd | 14 +++--- 2 files changed, 9

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

2014-08-15 Thread translation
commit 54ac65811b1948cdd8186f92ec9f33cbd9b83b2a Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 21:45:50 2014 + Update translations for torbutton-torbuttonproperties --- pt_BR/torbutton.properties |8 1 file changed, 4 insertions(+), 4

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

2014-08-15 Thread translation
commit 912bde262ac24e080aca119cb946e8b228926f71 Author: Translation commit bot translat...@torproject.org Date: Fri Aug 15 22:15:52 2014 + Update translations for torbutton-torbuttondtd --- pt_BR/torbutton.dtd |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git

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

2014-08-15 Thread translation
commit 51a9908e07b135744817ac91099f2ce20bc2b086 Author: Translation commit bot translat...@torproject.org Date: Sat Aug 16 02:45:21 2014 + Update translations for tails-greeter --- ms_MY/ms_MY.po | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2014-08-15 Thread translation
commit a5dbcbcd41477cf2e3f520ef316ff54d8d3a4e64 Author: Translation commit bot translat...@torproject.org Date: Sat Aug 16 02:45:56 2014 + Update translations for tor-and-https --- ms_MY.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ms_MY.po b/ms_MY.po

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

2014-08-15 Thread translation
commit a9d716cd31830f61fc6e1a81d2f064ea10d49f9b Author: Translation commit bot translat...@torproject.org Date: Sat Aug 16 03:15:22 2014 + Update translations for tails-greeter --- ms_MY/ms_MY.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms_MY/ms_MY.po

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2014-08-15 Thread translation
commit 962335e07573e2ce0ddf5e51417091c598435418 Author: Translation commit bot translat...@torproject.org Date: Sat Aug 16 03:15:53 2014 + Update translations for tor-and-https --- ms_MY.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms_MY.po b/ms_MY.po index