date:20160831

[tor-commits] [tor-messenger-build/updater] Disable automatic extensions updates

2016-08-31 Thread sukhbir

commit 5bc9c9b63526a7afca4f70ee12ff3c0511c7fa8d
Author: Sukhbir Singh 
Date:   Wed Aug 31 23:42:49 2016 -0400

Disable automatic extensions updates

Disable automatic updates of extensions that a user may install until we fix
the related issues. We will enable this in a later release.
---
 projects/instantbird/preferences.patch | 9 +
 1 file changed, 9 insertions(+)

diff --git a/projects/instantbird/preferences.patch 
b/projects/instantbird/preferences.patch
index 29c058e..3c75b02 100644
--- a/projects/instantbird/preferences.patch
+++ b/projects/instantbird/preferences.patch
@@ -81,6 +81,15 @@ diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.
  
  // disable logging for the search service update system by default
  pref("browser.search.update.log", false);
+@@ -222,7 +224,7 @@
+ pref("extensions.logging.enabled", false);
+ pref("general.skins.selectedSkin", "classic/1.0");
+ 
+-pref("extensions.update.enabled", true);
++pref("extensions.update.enabled", false);
+ pref("extensions.update.interval", 86400);
+ pref("extensions.update.url", 
"https://addons.instantbird.org/services/update.php?reqVersion=%REQ_VERSION%=%ITEM_ID%=%ITEM_VERSION%=%ITEM_MAXAPPVERSION%=%ITEM_STATUS%=%APP_ID%=%APP_VERSION%=%APP_OS%=%APP_ABI%=%APP_LOCALE%;);
+ pref("extensions.update.autoUpdateDefault", true);
 @@ -245,9 +247,9 @@
  pref("extensions.getMoreProtocolsURL", 
"https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/protocols/;);
  

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/updater] Hide redundant label in the updater window

2016-08-31 Thread sukhbir

commit 62c34bd6d4f27cda8ca11e559f37340f8432d3c8
Author: Sukhbir Singh 
Date:   Wed Aug 31 22:46:55 2016 -0400

Hide redundant label in the updater window
---
 projects/instantbird/updater-remove-links.mozpatch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/instantbird/updater-remove-links.mozpatch 
b/projects/instantbird/updater-remove-links.mozpatch
index 144d144..95f20a7 100644
--- a/projects/instantbird/updater-remove-links.mozpatch
+++ b/projects/instantbird/updater-remove-links.mozpatch
@@ -50,7 +50,7 @@ diff --git a/toolkit/mozapps/update/content/updates.xul 
b/toolkit/mozapps/update
  
 -
-+





___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Disable automatic extensions updates

2016-08-31 Thread sukhbir

commit 5bc9c9b63526a7afca4f70ee12ff3c0511c7fa8d
Author: Sukhbir Singh 
Date:   Wed Aug 31 23:42:49 2016 -0400

Disable automatic extensions updates

Disable automatic updates of extensions that a user may install until we fix
the related issues. We will enable this in a later release.
---
 projects/instantbird/preferences.patch | 9 +
 1 file changed, 9 insertions(+)

diff --git a/projects/instantbird/preferences.patch 
b/projects/instantbird/preferences.patch
index 29c058e..3c75b02 100644
--- a/projects/instantbird/preferences.patch
+++ b/projects/instantbird/preferences.patch
@@ -81,6 +81,15 @@ diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.
  
  // disable logging for the search service update system by default
  pref("browser.search.update.log", false);
+@@ -222,7 +224,7 @@
+ pref("extensions.logging.enabled", false);
+ pref("general.skins.selectedSkin", "classic/1.0");
+ 
+-pref("extensions.update.enabled", true);
++pref("extensions.update.enabled", false);
+ pref("extensions.update.interval", 86400);
+ pref("extensions.update.url", 
"https://addons.instantbird.org/services/update.php?reqVersion=%REQ_VERSION%=%ITEM_ID%=%ITEM_VERSION%=%ITEM_MAXAPPVERSION%=%ITEM_STATUS%=%APP_ID%=%APP_VERSION%=%APP_OS%=%APP_ABI%=%APP_LOCALE%;);
+ pref("extensions.update.autoUpdateDefault", true);
 @@ -245,9 +247,9 @@
  pref("extensions.getMoreProtocolsURL", 
"https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/protocols/;);
  

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Hide redundant label in the updater window

2016-08-31 Thread sukhbir

commit 62c34bd6d4f27cda8ca11e559f37340f8432d3c8
Author: Sukhbir Singh 
Date:   Wed Aug 31 22:46:55 2016 -0400

Hide redundant label in the updater window
---
 projects/instantbird/updater-remove-links.mozpatch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/instantbird/updater-remove-links.mozpatch 
b/projects/instantbird/updater-remove-links.mozpatch
index 144d144..95f20a7 100644
--- a/projects/instantbird/updater-remove-links.mozpatch
+++ b/projects/instantbird/updater-remove-links.mozpatch
@@ -50,7 +50,7 @@ diff --git a/toolkit/mozapps/update/content/updates.xul 
b/toolkit/mozapps/update
  
 -
-+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/updater] Update patch to remove links from the updater (closes #20032)

2016-08-31 Thread sukhbir

commit 1162c614b7ec0e21a49cc6754a35d0dc1e3dec5a
Author: Sukhbir Singh 
Date:   Wed Aug 31 17:22:30 2016 -0400

Update patch to remove links from the updater (closes #20032)
---
 projects/instantbird/updater-remove-links.mozpatch | 32 ++
 1 file changed, 32 insertions(+)

diff --git a/projects/instantbird/updater-remove-links.mozpatch 
b/projects/instantbird/updater-remove-links.mozpatch
index 9832a3f..144d144 100644
--- a/projects/instantbird/updater-remove-links.mozpatch
+++ b/projects/instantbird/updater-remove-links.mozpatch
@@ -23,3 +23,35 @@ diff --git a/toolkit/mozapps/update/content/updates.xul 
b/toolkit/mozapps/update
  

  
+@@ -205,8 +204,7 @@
+   
+   
+   
+-
++
+   
+ 
+   
+@@ -223,8 +221,8 @@
+   
+   
+-
++
+   
+ 
+   
+@@ -257,8 +255,8 @@
+   
+ 
+ 
+-
++
+   
+   
+   



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/updater] Add preference app.update.promptWaitTime

2016-08-31 Thread sukhbir

commit 497e4577b839f8300c0281f9425e18e5fcce5fd8
Author: Sukhbir Singh 
Date:   Wed Aug 31 22:28:31 2016 -0400

Add preference app.update.promptWaitTime

Borrowed from TBB, see http://kb.mozillazine.org/App.update.promptWaitTime
---
 projects/instantbird/preferences.patch | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/projects/instantbird/preferences.patch 
b/projects/instantbird/preferences.patch
index 6e5788b..29c058e 100644
--- a/projects/instantbird/preferences.patch
+++ b/projects/instantbird/preferences.patch
@@ -107,7 +107,7 @@ diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.
  
  // We have an Error Console menu item by default so let's display chrome 
errors
  pref("javascript.options.showInConsole", true);
-@@ -300,14 +302,70 @@
+@@ -300,14 +302,73 @@
  // 3  at the end of the tabstrip
  pref("browser.tabs.closeButtons", 1);
  
@@ -181,3 +181,6 @@ diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.
 +// Disable hardware acceleration
 +pref("gfx.direct2d.disabled", true);
 +pref("layers.acceleration.disabled", true);
++
++// Other Updates
++pref("app.update.promptWaitTime", 3600);

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Add preference app.update.promptWaitTime

2016-08-31 Thread sukhbir

commit 497e4577b839f8300c0281f9425e18e5fcce5fd8
Author: Sukhbir Singh 
Date:   Wed Aug 31 22:28:31 2016 -0400

Add preference app.update.promptWaitTime

Borrowed from TBB, see http://kb.mozillazine.org/App.update.promptWaitTime
---
 projects/instantbird/preferences.patch | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/projects/instantbird/preferences.patch 
b/projects/instantbird/preferences.patch
index 6e5788b..29c058e 100644
--- a/projects/instantbird/preferences.patch
+++ b/projects/instantbird/preferences.patch
@@ -107,7 +107,7 @@ diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.
  
  // We have an Error Console menu item by default so let's display chrome 
errors
  pref("javascript.options.showInConsole", true);
-@@ -300,14 +302,70 @@
+@@ -300,14 +302,73 @@
  // 3  at the end of the tabstrip
  pref("browser.tabs.closeButtons", 1);
  
@@ -181,3 +181,6 @@ diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.
 +// Disable hardware acceleration
 +pref("gfx.direct2d.disabled", true);
 +pref("layers.acceleration.disabled", true);
++
++// Other Updates
++pref("app.update.promptWaitTime", 3600);

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Update patch to remove links from the updater (closes #20032)

2016-08-31 Thread sukhbir

commit 1162c614b7ec0e21a49cc6754a35d0dc1e3dec5a
Author: Sukhbir Singh 
Date:   Wed Aug 31 17:22:30 2016 -0400

Update patch to remove links from the updater (closes #20032)
---
 projects/instantbird/updater-remove-links.mozpatch | 32 ++
 1 file changed, 32 insertions(+)

diff --git a/projects/instantbird/updater-remove-links.mozpatch 
b/projects/instantbird/updater-remove-links.mozpatch
index 9832a3f..144d144 100644
--- a/projects/instantbird/updater-remove-links.mozpatch
+++ b/projects/instantbird/updater-remove-links.mozpatch
@@ -23,3 +23,35 @@ diff --git a/toolkit/mozapps/update/content/updates.xul 
b/toolkit/mozapps/update
  

  
+@@ -205,8 +204,7 @@
+   
+   
+   
+-
++
+   
+ 
+   
+@@ -223,8 +221,8 @@
+   
+   
+-
++
+   
+ 
+   
+@@ -257,8 +255,8 @@
+   
+ 
+ 
+-
++
+   
+   
+   

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 837cdd28d6d0f0473e20f3f5e4dfbd157533a916
Author: Translation commit bot 
Date:   Wed Aug 31 18:48:17 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 fr_CA/prefs.dtd | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/fr_CA/prefs.dtd b/fr_CA/prefs.dtd
index b6ca6cf..5eccb59 100644
--- a/fr_CA/prefs.dtd
+++ b/fr_CA/prefs.dtd
@@ -1,4 +1,6 @@
 
+
+
 
 
 
@@ -10,4 +12,11 @@
 
 
 
-
\ No newline at end of file
+
+
+
+
+
+
+
+
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit eecc7454e568febc4e0da4bbc54629eefe48a2cf
Author: Translation commit bot 
Date:   Wed Aug 31 18:48:04 2016 +

Update translations for tor-messenger-prefsdtd
---
 fr_CA/prefs.dtd | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fr_CA/prefs.dtd b/fr_CA/prefs.dtd
index d0e4c28..5eccb59 100644
--- a/fr_CA/prefs.dtd
+++ b/fr_CA/prefs.dtd
@@ -13,10 +13,10 @@
 
 
 
-
-
+
+
 
-
-
-
-
\ No newline at end of file
+
+
+
+
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Actually, always monotime_init() in the unit tests.

2016-08-31 Thread nickm

commit 7ef4eef7641750c1e62dec69ef2125ece99a87e7
Author: Nick Mathewson 
Date:   Wed Aug 31 14:38:17 2016 -0400

Actually, always monotime_init() in the unit tests.
---
 src/test/testing_common.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index e3fe87c..6460713 100644
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@ -244,6 +244,8 @@ main(int c, const char **v)
 
   network_init();
 
+  monotime_init();
+
   struct tor_libevent_cfg cfg;
   memset(, 0, sizeof(cfg));
   tor_libevent_initialize();

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] It is not a bug to attempt to base32_decode a non-base32 string

2016-08-31 Thread nickm

commit 251b348d7b4c4f36bd0a3e14d10ace31c0e9bc25
Author: Nick Mathewson 
Date:   Wed Aug 31 14:31:00 2016 -0400

It is not a bug to attempt to base32_decode a non-base32 string

(Rationale: it isn't a bug to try this for a base16 or base64
string. It's just a bad input that we're detecting.)
---
 src/common/util_format.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/util_format.c b/src/common/util_format.c
index 9009e1a..aef9db8 100644
--- a/src/common/util_format.c
+++ b/src/common/util_format.c
@@ -88,7 +88,7 @@ base32_decode(char *dest, size_t destlen, const char *src, 
size_t srclen)
 else if (src[j] > 0x31 && src[j] < 0x38) tmp[j] = src[j] - 0x18;
 else if (src[j] > 0x40 && src[j] < 0x5B) tmp[j] = src[j] - 0x41;
 else {
-  log_warn(LD_BUG, "illegal character in base32 encoded string");
+  log_warn(LD_GENERAL, "illegal character in base32 encoded string");
   tor_free(tmp);
   return -1;
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Detect and suppress bug message from zlib compression bomb test

2016-08-31 Thread nickm

commit d4f05dcd0e0fe654d64950d70d6d54ff7a6a280e
Author: Nick Mathewson 
Date:   Wed Aug 31 14:30:34 2016 -0400

Detect and suppress bug message from zlib compression bomb test
---
 src/test/log_test_helpers.h | 7 +++
 src/test/test_util.c| 9 -
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h
index 039c7ae..f33ee67 100644
--- a/src/test/log_test_helpers.h
+++ b/src/test/log_test_helpers.h
@@ -35,6 +35,13 @@ int mock_saved_log_has_entry(void);
   tt_assert_msg(mock_saved_log_has_message_containing(str), \
 "expected log to contain " # str);
 
+#define expect_single_log_msg_containing(str) \
+  do {\
+tt_assert_msg(mock_saved_log_has_message_containing(str), \
+  "expected log to contain " # str);  \
+tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);\
+  } while (0);
+
 #define expect_no_log_msg(str) \
   tt_assert_msg(!mock_saved_log_has_message(str), \
 "expected log to not contain " # str);
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 061398c..2ff9d77 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -2216,10 +2216,17 @@ test_util_gzip_compression_bomb(void *arg)
   size_t result_len = 0;
   tor_zlib_state_t *state = NULL;
 
+
   /* Make sure we can't produce a compression bomb */
+  const int prev_level = setup_full_capture_of_logs(LOG_WARN);
   tt_int_op(-1, OP_EQ, tor_gzip_compress(, _len,
  one_mb, one_million,
  ZLIB_METHOD));
+  expect_single_log_msg_containing(
+ "We compressed something and got an insanely high "
+ "compression factor; other Tors would think this "
+ "was a zlib bomb.");
+  teardown_capture_of_logs(prev_level);
 
   /* Here's a compression bomb that we made manually. */
   const char compression_bomb[1039] =
@@ -5464,7 +5471,7 @@ struct testcase_t util_tests[] = {
   UTIL_LEGACY(strmisc),
   UTIL_LEGACY(pow2),
   UTIL_LEGACY(gzip),
-  UTIL_LEGACY(gzip_compression_bomb),
+  UTIL_TEST(gzip_compression_bomb, TT_FORK),
   UTIL_LEGACY(datadir),
   UTIL_LEGACY(memarea),
   UTIL_LEGACY(control_formats),



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Initialize monotonic timer code before using it in the tests

2016-08-31 Thread nickm

commit cfc62e2374ec34eb2892b032dd33f852daaada6d
Author: Nick Mathewson 
Date:   Wed Aug 31 14:34:49 2016 -0400

Initialize monotonic timer code before using it in the tests
---
 src/test/test_util.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/test/test_util.c b/src/test/test_util.c
index 2ff9d77..445abb9 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -5330,6 +5330,8 @@ test_util_monotonic_time(void *arg)
   uint64_t nsec1, nsec2, usec1, msec1;
   uint64_t nsecc1, nsecc2, usecc1, msecc1;
 
+  monotime_init();
+
   monotime_get();
   monotime_coarse_get();
   nsec1 = monotime_absolute_nsec();
@@ -5374,6 +5376,7 @@ static void
 test_util_monotonic_time_ratchet(void *arg)
 {
   (void)arg;
+  monotime_init();
   monotime_reset_ratchets_for_testing();
 
   /* win32, performance counter ratchet. */

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Always log [bug] warnings from the unit tests.

2016-08-31 Thread nickm

commit 273290d4fee31857d689ef5286e44dd268a9bd65
Author: Nick Mathewson 
Date:   Wed Aug 31 13:22:07 2016 -0400

Always log [bug] warnings from the unit tests.

We should consider them bugs.  If they are happening intentionally,
we should use the log_test_helpers code to capture and suppress
them.  But having them off-by-default has potential to cause
programming errors.
---
 src/test/testing_common.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index ea93663..e3fe87c 100644
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@ -272,6 +272,8 @@ main(int c, const char **v)
 log_severity_list_t s;
 memset(, 0, sizeof(s));
 set_log_severity_config(loglevel, LOG_ERR, );
+/* ALWAYS log bug warnings. */
+s.masks[LOG_WARN-LOG_ERR] |= LD_BUG;
 add_stream_log(, "", fileno(stdout));
   }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Require specific messages for remaining link-handshake failure cases

2016-08-31 Thread nickm

commit d299c043d405e0ba2f565009270bba012def6191
Author: Nick Mathewson 
Date:   Wed Aug 31 14:10:15 2016 -0400

Require specific messages for remaining link-handshake failure cases
---
 src/test/test_link_handshake.c | 34 +-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index ce12f2a..e1fd14b 100644
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -630,20 +630,31 @@ 
test_link_handshake_recv_authchallenge_ok_unrecognized(void *arg)
   }
 
 AUTHCHALLENGE_FAIL(badstate,
+   require_failure_message = "We're not currently doing a "
+ "v3 handshake";
d->c->base_.state = OR_CONN_STATE_CONNECTING)
 AUTHCHALLENGE_FAIL(badproto,
+   require_failure_message = "not using link protocol >= 3";
d->c->link_proto = 2)
 AUTHCHALLENGE_FAIL(as_server,
+   require_failure_message = "We didn't originate this "
+ "connection";
d->c->handshake_state->started_here = 0;)
 AUTHCHALLENGE_FAIL(duplicate,
+   require_failure_message = "We already received one";
d->c->handshake_state->received_auth_challenge = 1)
 AUTHCHALLENGE_FAIL(nocerts,
+   require_failure_message = "We haven't gotten a CERTS "
+ "cell yet";
d->c->handshake_state->received_certs_cell = 0)
 AUTHCHALLENGE_FAIL(tooshort,
+   require_failure_message = "It was not well-formed";
d->cell->payload_len = 33)
 AUTHCHALLENGE_FAIL(truncated,
+   require_failure_message = "It was not well-formed";
d->cell->payload_len = 34)
 AUTHCHALLENGE_FAIL(nonzero_circid,
+   require_failure_message = "It had a nonzero circuit ID";
d->cell->circ_id = 1337)
 
 static tor_x509_cert_t *mock_peer_cert = NULL;
@@ -859,47 +870,68 @@ test_link_handshake_auth_cell(void *arg)
   }
 
 AUTHENTICATE_FAIL(badstate,
+  require_failure_message = "We're not doing a v3 handshake";
   d->c2->base_.state = OR_CONN_STATE_CONNECTING)
 AUTHENTICATE_FAIL(badproto,
+  require_failure_message = "not using link protocol >= 3";
   d->c2->link_proto = 2)
 AUTHENTICATE_FAIL(atclient,
+  require_failure_message = "We originated this connection";
   d->c2->handshake_state->started_here = 1)
 AUTHENTICATE_FAIL(duplicate,
+  require_failure_message = "We already got one";
   d->c2->handshake_state->received_authenticate = 1)
 static void
 test_link_handshake_auth_already_authenticated(void *arg)
 {
   authenticate_data_t *d = arg;
+  const int prev_level = setup_capture_of_logs(LOG_INFO);
   d->c2->handshake_state->authenticated = 1;
   channel_tls_process_authenticate_cell(d->cell, d->chan2);
   tt_int_op(mock_close_called, ==, 1);
   tt_int_op(d->c2->handshake_state->authenticated, ==, 1);
+  expect_log_msg_containing("The peer is already authenticated");
  done:
-  ;
+  teardown_capture_of_logs(prev_level);
 }
+
 AUTHENTICATE_FAIL(nocerts,
+  require_failure_message = "We never got a certs cell";
   d->c2->handshake_state->received_certs_cell = 0)
 AUTHENTICATE_FAIL(noidcert,
+  require_failure_message = "We never got an identity "
+"certificate";
   tor_x509_cert_free(d->c2->handshake_state->id_cert);
   d->c2->handshake_state->id_cert = NULL)
 AUTHENTICATE_FAIL(noauthcert,
+  require_failure_message = "We never got an authentication "
+"certificate";
   tor_x509_cert_free(d->c2->handshake_state->auth_cert);
   d->c2->handshake_state->auth_cert = NULL)
 AUTHENTICATE_FAIL(tooshort,
+  require_failure_message = "Cell was way too short";
   d->cell->payload_len = 3)
 AUTHENTICATE_FAIL(badtype,
+  require_failure_message = "Authenticator type was not "
+"recognized";
   d->cell->payload[0] = 0xff)
 AUTHENTICATE_FAIL(truncated_1,
+  require_failure_message = "Authenticator was truncated";
   d->cell->payload[2]++)
 AUTHENTICATE_FAIL(truncated_2,
+  require_failure_message = "Authenticator was truncated";
   d->cell->payload[3]++)
 AUTHENTICATE_FAIL(tooshort_1,
+  require_failure_message = "Authenticator was too short";
   tt_int_op(d->cell->payload_len, >=, 260);
   d->cell->payload[2] -= 1;
   d->cell->payload_len -= 256;)
 AUTHENTICATE_FAIL(badcontent,
+  require_failure_message = "Some field in the

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

2016-08-31 Thread nickm

commit 240c58017d12799cfaa7b4e326a0c25a2be17c4c
Merge: 1f7dc82 05c2db3
Author: Nick Mathewson 
Date:   Wed Aug 31 14:09:21 2016 -0400

Merge branch 'log_test_improvements'

 changes/bug1_prep   |  20 
 src/common/log.c|   5 ++
 src/common/torlog.h |   5 ++
 src/common/tortls.c |   4 ++
 src/test/log_test_helpers.c | 103 +++-
 src/test/log_test_helpers.h |  12 +++--
 src/test/test_address.c |   5 +-
 src/test/test_compat_libevent.c |  12 -
 src/test/test_tortls.c  |   2 -
 src/test/test_util.c|   4 +-
 src/test/testing_common.c   |   2 +
 11 files changed, 153 insertions(+), 21 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Work even harder not to suppress logging messages unless we mean to.

2016-08-31 Thread nickm

commit 871b711f1016d0394ca1aae84cdfa267d213eb45
Author: Nick Mathewson 
Date:   Wed Aug 31 13:12:36 2016 -0400

Work even harder not to suppress logging messages unless we mean to.
---
 src/test/log_test_helpers.c | 33 -
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c
index d6982ae..2c99da8 100644
--- a/src/test/log_test_helpers.c
+++ b/src/test/log_test_helpers.c
@@ -23,6 +23,9 @@ static smartlist_t *saved_logs = NULL;
 /** Boolean: should we also send messages to the test-runner? */
 static int echo_to_real_logs = 1;
 
+/** Record logs at this level or more severe */
+static int record_logs_at_level = LOG_ERR;
+
 /**
  * As setup_capture_of_logs, but do not relay log messages into the main
  * logging system.
@@ -50,8 +53,15 @@ int
 setup_capture_of_logs(int new_level)
 {
   int previous_log = log_global_min_severity_;
-  /*  This can suppress, if logging is turned up high.  Will fix. -NM*/
-  log_global_min_severity_ = new_level;
+
+  /* Only change the log_global_min_severity_ if we're making things _more_
+   * verbose.  Otherwise we could prevent real log messages that the test-
+   * runner wanted.
+   */
+  if (log_global_min_severity_ < new_level)
+log_global_min_severity_ = new_level;
+
+  record_logs_at_level = new_level;
   mock_clean_saved_logs();
   saved_logs = smartlist_new();
   MOCK(logv, mock_saving_logv);
@@ -178,6 +188,18 @@ mock_saving_logv(int severity, log_domain_mask_t domain,
   buf[n]='\n';
   buf[n+1]='\0';
 
+  if (echo_to_real_logs) {
+tor_log(severity, domain|LD_NO_MOCK, "%s", buf);
+  }
+
+  if (severity > record_logs_at_level) {
+tor_free(buf);
+return;
+  }
+
+  if (!saved_logs)
+saved_logs = smartlist_new();
+
   mock_saved_log_entry_t *e = tor_malloc_zero(sizeof(mock_saved_log_entry_t));
   e->severity = severity;
   e->funcname = funcname;
@@ -186,12 +208,5 @@ mock_saving_logv(int severity, log_domain_mask_t domain,
   e->generated_msg = tor_strdup(buf);
   tor_free(buf);
 
-  if (!saved_logs)
-saved_logs = smartlist_new();
   smartlist_add(saved_logs, e);
-
-  if (echo_to_real_logs) {
-tor_log(severity, domain|LD_NO_MOCK, "%s", e->generated_msg);
-  }
 }
-



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] setup_capture_of_logs: no longer suppress log messages

2016-08-31 Thread nickm

commit f74916a98f97c7e80e46400e921d54466285d1fb
Author: Nick Mathewson 
Date:   Wed Aug 31 12:51:22 2016 -0400

setup_capture_of_logs: no longer suppress log messages

Previously setup_capture_of_logs would prevent log messages from
going to the console entirely.  That's a problem, since sometimes
log messages are bugs!  Now setup_capture_of_logs() acts sensibly.

If you really do need to keep a message from going to the console
entirely, there is setup_full_capture_of_logs().  But only use that
if you're prepared to make sure that there are no extraneous
messages generated at all.
---
 src/common/log.c|  5 +
 src/common/torlog.h |  5 +
 src/test/log_test_helpers.c | 16 +++-
 src/test/log_test_helpers.h |  5 +
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/common/log.c b/src/common/log.c
index cb62a37..71b6790 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -534,6 +534,11 @@ tor_log(int severity, log_domain_mask_t domain, const char 
*format, ...)
   if (severity > log_global_min_severity_)
 return;
   va_start(ap,format);
+#ifdef TOR_UNIT_TESTS
+  if (domain & LD_NO_MOCK)
+logv__real(severity, domain, NULL, NULL, format, ap);
+  else
+#endif
   logv(severity, domain, NULL, NULL, format, ap);
   va_end(ap);
 }
diff --git a/src/common/torlog.h b/src/common/torlog.h
index 80f37e0..6732a42 100644
--- a/src/common/torlog.h
+++ b/src/common/torlog.h
@@ -109,6 +109,11 @@
  * would. Used as a flag, not a log domain. */
 #define LD_NOFUNCNAME (1u<<30)
 
+#ifdef TOR_UNIT_TESTS
+/** This log message should not be intercepted by mock_saving_logv */
+#define LD_NO_MOCK (1u<<29)
+#endif
+
 /** Mask of zero or more log domains, OR'd together. */
 typedef uint32_t log_domain_mask_t;
 
diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c
index 1828689..8b67c39 100644
--- a/src/test/log_test_helpers.c
+++ b/src/test/log_test_helpers.c
@@ -6,6 +6,16 @@
 
 static smartlist_t *saved_logs = NULL;
 
+static int echo_to_real_logs = 1;
+
+int
+setup_full_capture_of_logs(int new_level)
+{
+  int result = setup_capture_of_logs(new_level);
+  echo_to_real_logs = 0;
+  return result;
+}
+
 int
 setup_capture_of_logs(int new_level)
 {
@@ -14,6 +24,7 @@ setup_capture_of_logs(int new_level)
   mock_clean_saved_logs();
   saved_logs = smartlist_new();
   MOCK(logv, mock_saving_logv);
+  echo_to_real_logs = 1;
   return previous_log;
 }
 
@@ -108,7 +119,6 @@ mock_saving_logv(int severity, log_domain_mask_t domain,
  const char *funcname, const char *suffix,
  const char *format, va_list ap)
 {
-  (void)domain;
   char *buf = tor_malloc_zero(10240);
   int n;
   n = tor_vsnprintf(buf,10240,format,ap);
@@ -127,5 +137,9 @@ mock_saving_logv(int severity, log_domain_mask_t domain,
   if (!saved_logs)
 saved_logs = smartlist_new();
   smartlist_add(saved_logs, e);
+
+  if (echo_to_real_logs) {
+tor_log(severity, domain|LD_NO_MOCK, "%s", e->generated_msg);
+  }
 }
 
diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h
index d767453..2cb76b2 100644
--- a/src/test/log_test_helpers.h
+++ b/src/test/log_test_helpers.h
@@ -22,6 +22,7 @@ void mock_saving_logv(int severity, log_domain_mask_t domain,
 void mock_clean_saved_logs(void);
 const smartlist_t *mock_saved_logs(void);
 int setup_capture_of_logs(int new_level);
+int setup_full_capture_of_logs(int new_level);
 void teardown_capture_of_logs(int prev);
 
 int mock_saved_log_has_message(const char *msg);
@@ -33,6 +34,10 @@ int mock_saved_log_has_entry(void);
   tt_assert_msg(mock_saved_log_has_message(str), \
 "expected log to contain " # str);
 
+#define expect_log_msg_containing(str) \
+  tt_assert_msg(mock_saved_log_has_message_containing(str), \
+"expected log to contain " # str);
+
 #define expect_no_log_msg(str) \
   tt_assert_msg(!mock_saved_log_has_message(str), \
 "expected log to not contain " # str);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Do not call tor_tls_server_info_callback(NULL) from tests.

2016-08-31 Thread nickm

commit 69dce0903187abc0a48606884c88588d276086d7
Author: Nick Mathewson 
Date:   Wed Aug 31 13:18:13 2016 -0400

Do not call tor_tls_server_info_callback(NULL) from tests.

This isn't valid behavior, and it causes a crash when you run
the unit tests at --debug.

I've added an IF_BUG_ONCE() check for this case.
---
 src/common/tortls.c| 4 
 src/test/test_tortls.c | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index a62efb5..23889be 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1489,6 +1489,10 @@ tor_tls_server_info_callback(const SSL *ssl, int type, 
int val)
   tor_tls_t *tls;
   (void) val;
 
+  IF_BUG_ONCE(ssl == NULL) {
+return; // LCOV_EXCL_LINE
+  }
+
   tor_tls_debug_state_callback(ssl, type, val);
 
   if (type != SSL_CB_ACCEPT_LOOP)
diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c
index 3a048fb..9115823 100644
--- a/src/test/test_tortls.c
+++ b/src/test/test_tortls.c
@@ -1831,8 +1831,6 @@ test_tortls_server_info_callback(void *ignored)
   tls->magic = TOR_TLS_MAGIC;
   tls->ssl = ssl;
 
-  tor_tls_server_info_callback(NULL, 0, 0);
-
   SSL_set_state(ssl, SSL3_ST_SW_SRVR_HELLO_A);
   mock_clean_saved_logs();
   tor_tls_server_info_callback(ssl, SSL_CB_ACCEPT_LOOP, 0);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Document and clean log_test_helpers.c a bit

2016-08-31 Thread nickm

commit 2df6cdc9f94f59c332bf3a00787320a98678bf4e
Author: Nick Mathewson 
Date:   Wed Aug 31 13:03:59 2016 -0400

Document and clean log_test_helpers.c a bit

In addition to documentation, this commit makes a function static,
and removes a weird single-point-of-return-ism, and notes a thing I
should fix.
---
 src/test/log_test_helpers.c | 64 -
 src/test/log_test_helpers.h |  7 ++---
 2 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c
index 8b67c39..d6982ae 100644
--- a/src/test/log_test_helpers.c
+++ b/src/test/log_test_helpers.c
@@ -4,10 +4,32 @@
 #include "torlog.h"
 #include "log_test_helpers.h"
 
+/**
+ * \file log_test_helpers.c
+ * \brief Code to check for expected log messages during testing.
+ */
+
+static void mock_saving_logv(int severity, log_domain_mask_t domain,
+ const char *funcname, const char *suffix,
+ const char *format, va_list ap)
+  CHECK_PRINTF(5, 0);
+
+/**
+ * Smartlist of all the logs we've received since we last set up
+ * log capture.
+ */
 static smartlist_t *saved_logs = NULL;
 
+/** Boolean: should we also send messages to the test-runner? */
 static int echo_to_real_logs = 1;
 
+/**
+ * As setup_capture_of_logs, but do not relay log messages into the main
+ * logging system.
+ *
+ * Avoid using this function; use setup_capture_of_logs() instead if you
+ * can. If you must use this function, then make sure you detect any
+ * unexpected log messages, and treat them as test failures. */
 int
 setup_full_capture_of_logs(int new_level)
 {
@@ -16,10 +38,19 @@ setup_full_capture_of_logs(int new_level)
   return result;
 }
 
+/**
+ * Temporarily capture all the messages logged at severity new_level or
+ * higher. Return the previous log level; you'll need to pass it into
+ * teardown_capture_of_logs().
+ *
+ * This function does not prevent messages from being sent to the main
+ * logging system.
+ */
 int
 setup_capture_of_logs(int new_level)
 {
   int previous_log = log_global_min_severity_;
+  /*  This can suppress, if logging is turned up high.  Will fix. -NM*/
   log_global_min_severity_ = new_level;
   mock_clean_saved_logs();
   saved_logs = smartlist_new();
@@ -28,6 +59,9 @@ setup_capture_of_logs(int new_level)
   return previous_log;
 }
 
+/**
+ * Undo setup_capture_of_logs().
+ */
 void
 teardown_capture_of_logs(int prev)
 {
@@ -36,6 +70,9 @@ teardown_capture_of_logs(int prev)
   mock_clean_saved_logs();
 }
 
+/**
+ * Clear all messages in mock_saved_logs()
+ */
 void
 mock_clean_saved_logs(void)
 {
@@ -47,29 +84,41 @@ mock_clean_saved_logs(void)
   saved_logs = NULL;
 }
 
+/**
+ * Return a list of all the messages captured since the last
+ * setup_[full_]capture_of_logs() call. Each log call is recorded as a
+ * mock_saved_log_entry_t.
+ */
 const smartlist_t *
 mock_saved_logs(void)
 {
   return saved_logs;
 }
 
+/**
+ * Return true iff there is a message recorded by log capture
+ * that is exactly equal to msg
+ */
 int
 mock_saved_log_has_message(const char *msg)
 {
-  int has_msg = 0;
   if (saved_logs) {
 SMARTLIST_FOREACH(saved_logs, mock_saved_log_entry_t *, m,
   {
 if (msg && m->generated_msg &&
 !strcmp(msg, m->generated_msg)) {
-  has_msg = 1;
+  return 1;
 }
   });
   }
 
-  return has_msg;
+  return 0;
 }
 
+/**
+ * Return true iff there is a message recorded by log capture
+ * that contains msg as a substring.
+ */
 int
 mock_saved_log_has_message_containing(const char *msg)
 {
@@ -87,7 +136,7 @@ mock_saved_log_has_message_containing(const char *msg)
 }
 
 
-/* Do the saved logs have any messages with severity? */
+/** Return true iff the saved logs have any messages with severity */
 int
 mock_saved_log_has_severity(int severity)
 {
@@ -104,7 +153,7 @@ mock_saved_log_has_severity(int severity)
   return has_sev;
 }
 
-/* Do the saved logs have any messages? */
+/** Return true iff the the saved logs have at lease one message */
 int
 mock_saved_log_has_entry(void)
 {
@@ -114,7 +163,10 @@ mock_saved_log_has_entry(void)
   return 0;
 }
 
-void
+/* Replacement for logv: record the log message, and (maybe) send it
+ * into the logging system again.
+ */
+static void
 mock_saving_logv(int severity, log_domain_mask_t domain,
  const char *funcname, const char *suffix,
  const char *format, va_list ap)
diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h
index 2cb76b2..039c7ae 100644
--- a/src/test/log_test_helpers.h
+++ b/src/test/log_test_helpers.h
@@ -6,19 +6,16 @@
 #ifndef TOR_LOG_TEST_HELPERS_H
 #define TOR_LOG_TEST_HELPERS_H
 
+/** An element of mock_saved_logs(); records the log element that we
+ * received. */
 typedef struct

[tor-commits] [tor/master] Use setup_full_capture_of_logs() where appropriate.

2016-08-31 Thread nickm

commit d5614b2102d3d9c6deb7190f77106ab7c0ef78ad
Author: Nick Mathewson 
Date:   Wed Aug 31 12:53:18 2016 -0400

Use setup_full_capture_of_logs() where appropriate.
---
 src/test/test_address.c |  5 -
 src/test/test_compat_libevent.c | 12 +++-
 src/test/test_util.c|  4 +++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/test/test_address.c b/src/test/test_address.c
index b4638f0..e984bea 100644
--- a/src/test/test_address.c
+++ b/src/test/test_address.c
@@ -824,9 +824,12 @@ test_address_get_if_addrs6_list_no_internal(void *arg)
   (void)arg;
 
   /* We might drop a log_err */
-  int prev_level = setup_capture_of_logs(LOG_ERR);
+  int prev_level = setup_full_capture_of_logs(LOG_ERR);
   results = get_interface_address6_list(LOG_ERR, AF_INET6, 0);
   tt_int_op(smartlist_len(mock_saved_logs()), OP_LE, 1);
+  if (smartlist_len(mock_saved_logs()) == 1) {
+expect_log_msg_containing("connect() failed");
+  }
   teardown_capture_of_logs(prev_level);
 
   tt_assert(results != NULL);
diff --git a/src/test/test_compat_libevent.c b/src/test/test_compat_libevent.c
index f13eb81..5e14be5 100644
--- a/src/test/test_compat_libevent.c
+++ b/src/test/test_compat_libevent.c
@@ -20,31 +20,36 @@ static void
 test_compat_libevent_logging_callback(void *ignored)
 {
   (void)ignored;
-  int previous_log = setup_capture_of_logs(LOG_DEBUG);
+  int previous_log = setup_full_capture_of_logs(LOG_DEBUG);
 
   libevent_logging_callback(_EVENT_LOG_DEBUG, "hello world");
   expect_log_msg("Message from libevent: hello world\n");
   expect_log_severity(LOG_DEBUG);
+  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);
 
   mock_clean_saved_logs();
   libevent_logging_callback(_EVENT_LOG_MSG, "hello world another time");
   expect_log_msg("Message from libevent: hello world another time\n");
   expect_log_severity(LOG_INFO);
+  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);
 
   mock_clean_saved_logs();
   libevent_logging_callback(_EVENT_LOG_WARN, "hello world a third time");
   expect_log_msg("Warning from libevent: hello world a third time\n");
   expect_log_severity(LOG_WARN);
+  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);
 
   mock_clean_saved_logs();
   libevent_logging_callback(_EVENT_LOG_ERR, "hello world a fourth time");
   expect_log_msg("Error from libevent: hello world a fourth time\n");
   expect_log_severity(LOG_ERR);
+  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);
 
   mock_clean_saved_logs();
   libevent_logging_callback(42, "hello world a fifth time");
   expect_log_msg("Message [42] from libevent: hello world a fifth time\n");
   expect_log_severity(LOG_WARN);
+  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);
 
   mock_clean_saved_logs();
   libevent_logging_callback(_EVENT_LOG_DEBUG,
@@ -75,21 +80,26 @@ test_compat_libevent_logging_callback(void *ignored)
 "012345678901234567890123456789"
 "012345678901234567890123456789\n");
   expect_log_severity(LOG_DEBUG);
+  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);
 
   mock_clean_saved_logs();
   libevent_logging_callback(42, "xxx\n");
   expect_log_msg("Message [42] from libevent: xxx\n");
   expect_log_severity(LOG_WARN);
+  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);
 
   suppress_libevent_log_msg("something");
   mock_clean_saved_logs();
   libevent_logging_callback(_EVENT_LOG_MSG, "hello there");
   expect_log_msg("Message from libevent: hello there\n");
   expect_log_severity(LOG_INFO);
+  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);
 
   mock_clean_saved_logs();
   libevent_logging_callback(_EVENT_LOG_MSG, "hello there something else");
   expect_no_log_msg("hello there something else");
+  if (mock_saved_logs())
+tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 0);
 
   // No way of verifying the result of this, it seems =/
   configure_libevent_logging();
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 5432b2c..061398c 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -5254,9 +5254,11 @@ test_util_pwdb(void *arg)
   tt_assert(found);
   tor_free(dir);
 
-  prev_level = setup_capture_of_logs(LOG_ERR); /* We should do a LOG_ERR */
+  /* We should do a LOG_ERR */
+  prev_level = setup_full_capture_of_logs(LOG_ERR);
   dir = get_user_homedir(badname);
   tt_assert(dir == NULL);
+  expect_log_msg_containing("not found");
   tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);
   teardown_capture_of_logs(prev_level);
   prev_level = -100;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Changes file for log test improvements

2016-08-31 Thread nickm

commit 05c2db3f0bec9fe2e41ea62fbb6e5bd8ac755da4
Author: Nick Mathewson 
Date:   Wed Aug 31 13:35:46 2016 -0400

Changes file for log test improvements
---
 changes/bug1_prep | 20 
 1 file changed, 20 insertions(+)

diff --git a/changes/bug1_prep b/changes/bug1_prep
new file mode 100644
index 000..e8bb4a5
--- /dev/null
+++ b/changes/bug1_prep
@@ -0,0 +1,20 @@
+  o Minor features (unit tests):
+- The unit tests now log all warning messages with the "BUG" flag.
+  Previously, they only logged errors by default. This change will
+  help us make our testing code more correct, and make sure that
+  we only hit this code when we mean to. This is preparatory work
+  for ticket 1.
+- Our unit testing code that captures log messages no longer prevents
+  them from being written out if the user asked for them (by passing
+  --debug or --info or or --notice --warn to the "test" binary). This
+  change will prevent us from missing unexpected log messages simply
+  because we were looking for others. Related to ticket 1.
+- Our link-handshake unit tests now check, that when invalid
+  handshakes fail, they fail with the error messages we
+  expected.
+
+  o Minor bugfixes (unit tests):
+- The tor_tls_server_info_callback unit test no longer crashes when
+  debug-level logging is turned on. Fixes bug 20041; bugfix on
+  0.2.8.1-alpha.
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/updater] Set safe updateURL for default theme

2016-08-31 Thread sukhbir

commit 94d53d4f7623809e93404d4d0bec87d1f80ed6e7
Author: Sukhbir Singh 
Date:   Wed Aug 31 13:26:38 2016 -0400

Set safe updateURL for default theme
---
 projects/instantbird/config   |  1 +
 projects/instantbird/theme-extension-update.patch | 12 
 2 files changed, 13 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index 7d5f790..b421403 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -83,6 +83,7 @@ input_files:
   - filename: search-preferences-xul.patch
   - filename: log-preferences-xul.patch
   - filename: themes-remove-links.patch
+  - filename: theme-extension-update.patch
   - filename: branding/blistWindow.png
   - filename: branding/blistWindow16.png
   - filename: branding/blistWindow48.png
diff --git a/projects/instantbird/theme-extension-update.patch 
b/projects/instantbird/theme-extension-update.patch
new file mode 100644
index 000..a1585a8
--- /dev/null
+++ b/projects/instantbird/theme-extension-update.patch
@@ -0,0 +1,12 @@
+diff --git 
a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf 
b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+--- 
a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 
b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+@@ -26,6 +26,8 @@
+ 
+ Instantbird (default)
+ The default theme.
++data:text/plain,
++-
+ 
+

[tor-commits] [tor-messenger-build/updater] Bump ctypes-otr to 0.0.2

2016-08-31 Thread sukhbir

commit d7fc5e4b8e975bcbf0d7283bdf206acb8ed44bb9
Author: Arlo Breault 
Date:   Wed Aug 31 10:20:22 2016 -0700

Bump ctypes-otr to 0.0.2
---
 ChangeLog  | 4 +---
 projects/ctypes-otr/config | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ded8549..ace3cbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,9 +7,7 @@ Tor Messenger 0.2.0b1 --
* Bug 14388: Secure automatic updates for Tor Messenger
* Bug 13861: Preserve user profiles after updates
* Update libgcrypt to 1.6.6 for CVE-2016-6316
-   * ctypes-otr
- * GH 66: Provide functionality for adding verified fingerprints (patch by 
Vu Quoc Huy)
- * GH 73: Show progress during verification in notification box (patch by 
Vu Quoc Huy)
+   * Update ctypes-otr to 0.0.2
  * Linux
* Bug 18634: Switch to building Tor Messenger on Debian Wheezy
  * Mac
diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config
index 0a61b42..de47d55 100644
--- a/projects/ctypes-otr/config
+++ b/projects/ctypes-otr/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.0.1
+version: 0.0.2
 git_url: https://github.com/arlolra/ctypes-otr
 git_hash: '[% c("version") %]'
 gpg_keyring: arlolra.gpg



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Set safe updateURL for default theme

2016-08-31 Thread sukhbir

commit 94d53d4f7623809e93404d4d0bec87d1f80ed6e7
Author: Sukhbir Singh 
Date:   Wed Aug 31 13:26:38 2016 -0400

Set safe updateURL for default theme
---
 projects/instantbird/config   |  1 +
 projects/instantbird/theme-extension-update.patch | 12 
 2 files changed, 13 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index 7d5f790..b421403 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -83,6 +83,7 @@ input_files:
   - filename: search-preferences-xul.patch
   - filename: log-preferences-xul.patch
   - filename: themes-remove-links.patch
+  - filename: theme-extension-update.patch
   - filename: branding/blistWindow.png
   - filename: branding/blistWindow16.png
   - filename: branding/blistWindow48.png
diff --git a/projects/instantbird/theme-extension-update.patch 
b/projects/instantbird/theme-extension-update.patch
new file mode 100644
index 000..a1585a8
--- /dev/null
+++ b/projects/instantbird/theme-extension-update.patch
@@ -0,0 +1,12 @@
+diff --git 
a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf 
b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+--- 
a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 
b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+@@ -26,6 +26,8 @@
+ 
+ Instantbird (default)
+ The default theme.
++data:text/plain,
++-
+ 
+

[tor-commits] [tor-messenger-build/master] Bump ctypes-otr to 0.0.2

2016-08-31 Thread arlo

commit d7fc5e4b8e975bcbf0d7283bdf206acb8ed44bb9
Author: Arlo Breault 
Date:   Wed Aug 31 10:20:22 2016 -0700

Bump ctypes-otr to 0.0.2
---
 ChangeLog  | 4 +---
 projects/ctypes-otr/config | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ded8549..ace3cbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,9 +7,7 @@ Tor Messenger 0.2.0b1 --
* Bug 14388: Secure automatic updates for Tor Messenger
* Bug 13861: Preserve user profiles after updates
* Update libgcrypt to 1.6.6 for CVE-2016-6316
-   * ctypes-otr
- * GH 66: Provide functionality for adding verified fingerprints (patch by 
Vu Quoc Huy)
- * GH 73: Show progress during verification in notification box (patch by 
Vu Quoc Huy)
+   * Update ctypes-otr to 0.0.2
  * Linux
* Bug 18634: Switch to building Tor Messenger on Debian Wheezy
  * Mac
diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config
index 0a61b42..de47d55 100644
--- a/projects/ctypes-otr/config
+++ b/projects/ctypes-otr/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.0.1
+version: 0.0.2
 git_url: https://github.com/arlolra/ctypes-otr
 git_hash: '[% c("version") %]'
 gpg_keyring: arlolra.gpg

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] fix header sizes in job posting

2016-08-31 Thread sebastian

commit b9b304970d5aba9cb965e41893b0091466a3e256
Author: Sebastian Hahn 
Date:   Wed Aug 31 18:39:21 2016 +0200

fix header sizes in job posting
---
 about/en/jobs-grants-officer.wml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/about/en/jobs-grants-officer.wml b/about/en/jobs-grants-officer.wml
index 3227fa6..eb93b0b 100644
--- a/about/en/jobs-grants-officer.wml
+++ b/about/en/jobs-grants-officer.wml
@@ -28,9 +28,9 @@ understanding.â
 Officer. This new, senior level position will report directly to the
 Executive Director and will manage the offsite Accounting Manager.
 
-The Chief Financial and
+The Chief Financial and
 Grants Officer will serve as the Tor Project's senior grants officer.
-Grant-related tasks include, but are not limited to:
+Grant-related tasks include, but are not limited to:
 
 
 Oversee grants and contracts to ensure compliance with funder

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Another log testing helper helper, for matching partial strings.

2016-08-31 Thread nickm

commit 14c07f3f2199053e92c6bea90da332efbb3811e4
Author: Nick Mathewson 
Date:   Wed Aug 31 11:35:12 2016 -0400

Another log testing helper helper, for matching partial strings.
---
 src/test/log_test_helpers.c | 17 +
 src/test/log_test_helpers.h |  1 +
 2 files changed, 18 insertions(+)

diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c
index 166a777..1828689 100644
--- a/src/test/log_test_helpers.c
+++ b/src/test/log_test_helpers.c
@@ -59,6 +59,23 @@ mock_saved_log_has_message(const char *msg)
   return has_msg;
 }
 
+int
+mock_saved_log_has_message_containing(const char *msg)
+{
+  if (saved_logs) {
+SMARTLIST_FOREACH(saved_logs, mock_saved_log_entry_t *, m,
+  {
+if (msg && m->generated_msg &&
+strstr(m->generated_msg, msg)) {
+  return 1;
+}
+  });
+  }
+
+  return 0;
+}
+
+
 /* Do the saved logs have any messages with severity? */
 int
 mock_saved_log_has_severity(int severity)
diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h
index 1966f17..d767453 100644
--- a/src/test/log_test_helpers.h
+++ b/src/test/log_test_helpers.h
@@ -25,6 +25,7 @@ int setup_capture_of_logs(int new_level);
 void teardown_capture_of_logs(int prev);
 
 int mock_saved_log_has_message(const char *msg);
+int mock_saved_log_has_message_containing(const char *msg);
 int mock_saved_log_has_severity(int severity);
 int mock_saved_log_has_entry(void);
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Fix all "BUG" warnings created from link-handshake tests.

2016-08-31 Thread nickm

commit 26a63a93033fd2f46558b7b1ec2140c4d309cc38
Author: Nick Mathewson 
Date:   Wed Aug 31 11:37:18 2016 -0400

Fix all "BUG" warnings created from link-handshake tests.
---
 src/test/test_link_handshake.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index 4038783..49e24ab 100644
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -173,6 +173,8 @@ test_link_handshake_certs_ok(void *arg)
   UNMOCK(tor_tls_cert_matches_key);
   UNMOCK(connection_or_write_var_cell_to_buf);
   UNMOCK(connection_or_send_netinfo);
+  memset(c1->identity_digest, 0, sizeof(c1->identity_digest));
+  memset(c2->identity_digest, 0, sizeof(c2->identity_digest));
   connection_free_(TO_CONN(c1));
   connection_free_(TO_CONN(c2));
   tor_free(cell1);
@@ -209,6 +211,7 @@ recv_certs_cleanup(const struct testcase_t *test, void *obj)
   if (d) {
 tor_free(d->cell);
 certs_cell_free(d->ccell);
+connection_or_remove_from_identity_map(d->c);
 connection_free_(TO_CONN(d->c));
 circuitmux_free(d->chan->base_.cmux);
 tor_free(d->chan);
@@ -650,6 +653,8 @@ authenticate_data_cleanup(const struct testcase_t *test, 
void *arg)
   authenticate_data_t *d = arg;
   if (d) {
 tor_free(d->cell);
+connection_or_remove_from_identity_map(d->c1);
+connection_or_remove_from_identity_map(d->c2);
 connection_free_(TO_CONN(d->c1));
 connection_free_(TO_CONN(d->c2));
 circuitmux_free(d->chan2->base_.cmux);
@@ -677,6 +682,8 @@ authenticate_data_setup(const struct testcase_t *test)
   MOCK(channel_set_circid_type, mock_set_circid_type);
   d->c1 = or_connection_new(CONN_TYPE_OR, AF_INET);
   d->c2 = or_connection_new(CONN_TYPE_OR, AF_INET);
+  tor_addr_from_ipv4h(>c1->base_.addr, 0x01020304);
+  tor_addr_from_ipv4h(>c2->base_.addr, 0x05060708);
 
   d->key1 = pk_generate(2);
   d->key2 = pk_generate(3);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Fix the test network IPv6 check so it works on Linux

2016-08-31 Thread nickm

commit b822c5891a2a62640c1d64849f735559e55c662e
Author: teor 
Date:   Wed Aug 31 15:22:34 2016 +1000

Fix the test network IPv6 check so it works on Linux
---
 Makefile.am  | 4 ++--
 changes/bug19905 | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e45856c..c160af9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,11 +100,11 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
 # only run IPv6 tests if we can ping6 ::1 (localhost)
 # some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011)
 # only run mixed tests if we have a tor-stable binary
-# see #17015 for autodetection of different tor versions
+# Try both the BSD and the Linux ping6 syntax, because they're incompatible
 test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
-   if ping6 -q -c 1 -o ::1 >/dev/null 2>&1; then \
+   if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
else \
diff --git a/changes/bug19905 b/changes/bug19905
new file mode 100644
index 000..b689740
--- /dev/null
+++ b/changes/bug19905
@@ -0,0 +1,3 @@
+  o Minor bugfixes (IPv6, testing):
+- Check for IPv6 correctly on Linux when running test networks.
+  Fixes bug 19905; bugfix on 0.2.7.3-rc; patch by teor.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug19905'

2016-08-31 Thread nickm

commit debe846cb88c1157c1820c88a7128dd2362335d3
Merge: bbac9e1 b822c58
Author: Nick Mathewson 
Date:   Wed Aug 31 10:58:41 2016 -0400

Merge remote-tracking branch 'teor/bug19905'

 Makefile.am  | 4 ++--
 changes/bug19905 | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Don't warn on unlink(bw_accounting) when errno == ENOENT

2016-08-31 Thread nickm

commit bbac9e1d0ceb173e2c3c12b1837b6036f10f50ea
Author: Nick Mathewson 
Date:   Wed Aug 31 10:57:09 2016 -0400

Don't warn on unlink(bw_accounting) when errno == ENOENT

Patch from pastly; fixes bug 19964.
---
 changes/bug19964   | 6 ++
 src/or/hibernate.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/bug19964 b/changes/bug19964
new file mode 100644
index 000..af71942
--- /dev/null
+++ b/changes/bug19964
@@ -0,0 +1,6 @@
+  o Minor bugfixes (logging):
+- When we are unable to remove the bw_accounting file, do not warn
+  if the reason we couldn't remove it was that it didn't exist.
+  Fixes bug 19964; bugfix on 0.2.5.4-alpha. Patch
+  from 'pastly'.
+
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 209aae0..7e25306 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -692,7 +692,7 @@ read_bandwidth_usage(void)
 int res;
 
 res = unlink(fname);
-if (res != 0) {
+if (res != 0 && errno != ENOENT) {
   log_warn(LD_FS,
"Failed to unlink %s: %s",
fname, strerror(errno));

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Fix a deref-before-null-check complaint

2016-08-31 Thread nickm

commit c15b99e6e99fef6130dd6c53609a664efd82ef50
Author: Nick Mathewson 
Date:   Wed Aug 31 10:32:10 2016 -0400

Fix a deref-before-null-check complaint

Found by coverity scan; this is CID 1372329.

Also, reindent some oddly indented code.
---
 src/or/circuitbuild.c | 22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 2e7ea2f..aa2b0b2 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -855,7 +855,12 @@ circuit_pick_extend_handshake(uint8_t *cell_type_out,
   /* 030 Remove support for deciding to use TAP. */
 
   /* It is an error to extend if there is no previous node. */
-  tor_assert_nonfatal(node_prev);
+  if (BUG(node_prev == NULL)) {
+*cell_type_out = RELAY_COMMAND_EXTEND;
+*create_cell_type_out = CELL_CREATE;
+return;
+  }
+
   /* It is an error for a node with a known version to be so old it does not
* support ntor. */
   tor_assert_nonfatal(routerstatus_version_supports_ntor(node_prev->rs, 1));
@@ -863,16 +868,15 @@ circuit_pick_extend_handshake(uint8_t *cell_type_out,
   /* Assume relays without tor versions or routerstatuses support ntor.
* The authorities enforce ntor support, and assuming and failing is better
* than allowing a malicious node to perform a protocol downgrade to TAP. */
-  if (node_prev &&
-  *handshake_type_out != ONION_HANDSHAKE_TYPE_TAP &&
+  if (*handshake_type_out != ONION_HANDSHAKE_TYPE_TAP &&
   (node_has_curve25519_onion_key(node_prev) ||
(routerstatus_version_supports_ntor(node_prev->rs, 1 {
-*cell_type_out = RELAY_COMMAND_EXTEND2;
-*create_cell_type_out = CELL_CREATE2;
-  } else {
-*cell_type_out = RELAY_COMMAND_EXTEND;
-*create_cell_type_out = CELL_CREATE;
-  }
+*cell_type_out = RELAY_COMMAND_EXTEND2;
+*create_cell_type_out = CELL_CREATE2;
+  } else {
+*cell_type_out = RELAY_COMMAND_EXTEND;
+*create_cell_type_out = CELL_CREATE;
+  }
 }
 
 /** This is the backbone function for building circuits.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 4609e61acfefa46f61dc258314b155c43af80bad
Author: Translation commit bot 
Date:   Wed Aug 31 11:46:17 2016 +

Update translations for tails-misc
---
 hr_HR.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hr_HR.po b/hr_HR.po
index 7c5a967..c9477f2 100644
--- a/hr_HR.po
+++ b/hr_HR.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-31 10:43+0200\n"
-"PO-Revision-Date: 2016-08-30 09:52+\n"
+"PO-Revision-Date: 2016-08-31 11:33+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -236,14 +236,14 @@ msgstr "Druge poruke pruÅ¾ene od strane GnuPG-a:"
 
 #: config/chroot_local-includes/usr/local/bin/icedove:27
 msgid "The Claws Mail persistence feature is activated."
-msgstr "Claws Mail-ova znaÄajka trajnosti je aktivirana."
+msgstr "Claws Mailova znaÄajka trajnosti je aktivirana."
 
 #: config/chroot_local-includes/usr/local/bin/icedove:29
 msgid ""
 "If you have emails saved in Claws Mail, you should migrate"
 " your data before starting Icedove."
-msgstr "Ako imate email-ove pohranjene u Claws Mail-u, trebali bi migrirati
 svoje podatke prije pokretanja Icedove-a."
+msgstr "Ako imate emailove pohranjene u Claws Mailu, trebali bi migrirati
 svoje podatke prije pokretanja Icedovea."
 
 #: config/chroot_local-includes/usr/local/bin/icedove:34
 msgid ""
@@ -262,7 +262,7 @@ msgstr "IskljuÄi"
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:16
 msgid "not available"
-msgstr "Nije dostupno"
+msgstr "nije dostupno"
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:19
 #: 
../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1
@@ -283,7 +283,7 @@ msgstr "Informacije o verziji:\n%s"
 #: config/chroot_local-includes/usr/local/bin/tails-about:27
 #: 
../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1
 msgid "About Tails"
-msgstr "O Tails-u"
+msgstr "O Tailsu"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 47571f21d6bc29fe5801a5d1c6fa09b514c1b462
Author: Translation commit bot 
Date:   Wed Aug 31 11:46:21 2016 +

Update translations for tails-misc_completed
---
 hr_HR.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hr_HR.po b/hr_HR.po
index 7c5a967..c9477f2 100644
--- a/hr_HR.po
+++ b/hr_HR.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-31 10:43+0200\n"
-"PO-Revision-Date: 2016-08-30 09:52+\n"
+"PO-Revision-Date: 2016-08-31 11:33+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -236,14 +236,14 @@ msgstr "Druge poruke pruÅ¾ene od strane GnuPG-a:"
 
 #: config/chroot_local-includes/usr/local/bin/icedove:27
 msgid "The Claws Mail persistence feature is activated."
-msgstr "Claws Mail-ova znaÄajka trajnosti je aktivirana."
+msgstr "Claws Mailova znaÄajka trajnosti je aktivirana."
 
 #: config/chroot_local-includes/usr/local/bin/icedove:29
 msgid ""
 "If you have emails saved in Claws Mail, you should migrate"
 " your data before starting Icedove."
-msgstr "Ako imate email-ove pohranjene u Claws Mail-u, trebali bi migrirati
 svoje podatke prije pokretanja Icedove-a."
+msgstr "Ako imate emailove pohranjene u Claws Mailu, trebali bi migrirati
 svoje podatke prije pokretanja Icedovea."
 
 #: config/chroot_local-includes/usr/local/bin/icedove:34
 msgid ""
@@ -262,7 +262,7 @@ msgstr "IskljuÄi"
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:16
 msgid "not available"
-msgstr "Nije dostupno"
+msgstr "nije dostupno"
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:19
 #: 
../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1
@@ -283,7 +283,7 @@ msgstr "Informacije o verziji:\n%s"
 #: config/chroot_local-includes/usr/local/bin/tails-about:27
 #: 
../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1
 msgid "About Tails"
-msgstr "O Tails-u"
+msgstr "O Tailsu"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit e1237c7243db880ab4532d997715e1149b605c65
Author: Translation commit bot 
Date:   Wed Aug 31 11:46:10 2016 +

Update translations for tor-launcher-network-settings
---
 hr_HR/network-settings.dtd | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hr_HR/network-settings.dtd b/hr_HR/network-settings.dtd
index e5d0668..902c4f0 100644
--- a/hr_HR/network-settings.dtd
+++ b/hr_HR/network-settings.dtd
@@ -65,13 +65,13 @@ s Tor mreÅ¾om?">
 
 
 
-
-
+
+
 
-
+
 https://bridges.torproject.org;>
-
+
 
-https://www.riseup.net, 
https://mail.google.com, ili https://mail.yahoo.com;>
-
+https://www.riseup.net, 
https://mail.google.com ili https://mail.yahoo.com;>
+
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 9f3a5b67a43b47abca9c87c84094da21b97cd2e0
Author: Translation commit bot 
Date:   Wed Aug 31 11:46:14 2016 +

Update translations for tor-launcher-network-settings_completed
---
 hr_HR/network-settings.dtd | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hr_HR/network-settings.dtd b/hr_HR/network-settings.dtd
index e5d0668..902c4f0 100644
--- a/hr_HR/network-settings.dtd
+++ b/hr_HR/network-settings.dtd
@@ -65,13 +65,13 @@ s Tor mreÅ¾om?">
 
 
 
-
-
+
+
 
-
+
 https://bridges.torproject.org;>
-
+
 
-https://www.riseup.net, 
https://mail.google.com, ili https://mail.yahoo.com;>
-
+https://www.riseup.net, 
https://mail.google.com ili https://mail.yahoo.com;>
+
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit b53bfacbb2b7d2ad84c321f93a084b8a63344cc1
Author: Translation commit bot 
Date:   Wed Aug 31 11:45:35 2016 +

Update translations for tails-persistence-setup
---
 hr_HR/hr_HR.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index a9d8840..6626f10 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2016-08-30 09:52+\n"
+"PO-Revision-Date: 2016-08-31 11:33+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -250,11 +250,11 @@ msgstr "Neuspjelo"
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:283
 msgid "Mounting Tails persistence partition."
-msgstr "Postavljam Tails-ovu trajnu particiju."
+msgstr "Postavljam Tailsovu trajnu particiju."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:286
 msgid "The Tails persistence partition will be mounted."
-msgstr "Tails-ova trajna particija Äe biti postavljena."
+msgstr "Tailsova trajna particija Äe biti postavljena."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:295
 msgid "Correcting permissions of the persistent volume."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2016-08-31 Thread translation

commit 7510845d0f755e0be0e012fb2ce486690b8c734e
Author: Translation commit bot 
Date:   Wed Aug 31 11:45:31 2016 +

Update translations for liveusb-creator_completed
---
 hr_HR/hr_HR.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index 7ea540e..8d94e21 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-08-30 09:53+\n"
+"PO-Revision-Date: 2016-08-31 11:32+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -315,11 +315,11 @@ msgstr "Izdanja aÅ¾urirana!"
 #: ../liveusb/creator.py:997 ../liveusb/creator.py:1331
 #, python-format
 msgid "Removing %(file)s"
-msgstr "MiÄem %(file)s"
+msgstr "Uklanjam %(file)s"
 
 #: ../liveusb/creator.py:492
 msgid "Removing existing Live OS"
-msgstr "MiÄem postojeÄi Å½ivi OS"
+msgstr "Uklanjam postojeÄi Å½ivi OS"
 
 #: ../liveusb/creator.py:1186
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 791607f6570369fba4825d79642360f0c30dc115
Author: Translation commit bot 
Date:   Wed Aug 31 11:45:52 2016 +

Update translations for torbirdy_completed
---
 hr_HR/torbirdy.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr_HR/torbirdy.dtd b/hr_HR/torbirdy.dtd
index 6674e10..ae1c708 100644
--- a/hr_HR/torbirdy.dtd
+++ b/hr_HR/torbirdy.dtd
@@ -50,7 +50,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 7f7027782d6e7281901d1aac2e3cfb4e7b468251
Author: Translation commit bot 
Date:   Wed Aug 31 11:45:38 2016 +

Update translations for tails-persistence-setup_completed
---
 hr_HR/hr_HR.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index a9d8840..6626f10 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2016-08-30 09:52+\n"
+"PO-Revision-Date: 2016-08-31 11:33+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -250,11 +250,11 @@ msgstr "Neuspjelo"
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:283
 msgid "Mounting Tails persistence partition."
-msgstr "Postavljam Tails-ovu trajnu particiju."
+msgstr "Postavljam Tailsovu trajnu particiju."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:286
 msgid "The Tails persistence partition will be mounted."
-msgstr "Tails-ova trajna particija Äe biti postavljena."
+msgstr "Tailsova trajna particija Äe biti postavljena."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:295
 msgid "Correcting permissions of the persistent volume."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 5373f5c211011153f1e40ec964451fad504c66dd
Author: Translation commit bot 
Date:   Wed Aug 31 11:45:48 2016 +

Update translations for torbirdy
---
 hr_HR/torbirdy.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr_HR/torbirdy.dtd b/hr_HR/torbirdy.dtd
index 6674e10..ae1c708 100644
--- a/hr_HR/torbirdy.dtd
+++ b/hr_HR/torbirdy.dtd
@@ -50,7 +50,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2016-08-31 Thread translation

commit 88f56f754e46bfa30b21c38e1baa0c932a4a7752
Author: Translation commit bot 
Date:   Wed Aug 31 11:45:28 2016 +

Update translations for liveusb-creator
---
 hr_HR/hr_HR.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index 7ea540e..8d94e21 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-08-30 09:53+\n"
+"PO-Revision-Date: 2016-08-31 11:32+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -315,11 +315,11 @@ msgstr "Izdanja aÅ¾urirana!"
 #: ../liveusb/creator.py:997 ../liveusb/creator.py:1331
 #, python-format
 msgid "Removing %(file)s"
-msgstr "MiÄem %(file)s"
+msgstr "Uklanjam %(file)s"
 
 #: ../liveusb/creator.py:492
 msgid "Removing existing Live OS"
-msgstr "MiÄem postojeÄi Å½ivi OS"
+msgstr "Uklanjam postojeÄi Å½ivi OS"
 
 #: ../liveusb/creator.py:1186
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2016-08-31 Thread translation

commit 7f4e1065bcb35d82231c0dd7a6042dbdedd1c8ff
Author: Translation commit bot 
Date:   Wed Aug 31 11:18:32 2016 +

Update translations for tails-openpgp-applet
---
 vi/openpgp-applet.pot | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/vi/openpgp-applet.pot b/vi/openpgp-applet.pot
index 91a02bf..cbb782c 100644
--- a/vi/openpgp-applet.pot
+++ b/vi/openpgp-applet.pot
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Acooldude, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2015-11-23 02:23+\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2016-08-31 11:10+\n"
+"Last-Translator: Acooldude\n"
 "Language-Team: Vietnamese 
(http://www.transifex.com/otf/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: bin/openpgp-applet:163
 msgid "You are about to exit OpenPGP Applet. Are you sure?"
-msgstr ""
+msgstr "Báº¡n Äá»nh thoÃ¡t khá»i OpenPGP Applet. Báº¡n cháº¯c chá»©?"
 
 #: bin/openpgp-applet:175
 msgid "OpenPGP encryption applet"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 757233370836e5a0099b0aa5e036b9108acca674
Author: Translation commit bot 
Date:   Wed Aug 31 11:17:02 2016 +

Update translations for tor_animation_completed
---
 vi.srt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vi.srt b/vi.srt
index 0a27128..ccb7ecd 100644
--- a/vi.srt
+++ b/vi.srt
@@ -5,11 +5,11 @@ ChÃºng ta ÄÃ£ quÃ¡ quen vá»i Internet
 2
 00:00:03,120 --> 00:00:07,700
 ChÃºng ta Äang liÃªn tá»¥c chia sáº» thÃ´ng tin
-vá» báº£n thÃ¢n chÃºng ta vÃ  vá» cuá»c sá»ng riÃªng tÆ°
+vá» báº£n thÃ¢n vÃ  vá» cuá»c sá»ng riÃªng tÆ° cá»§a chÃºng ta
 
 3
 00:00:08,000 --> 00:00:09,960
-thá»©c Än chÃºng ta dÃ¹ng, nhá»¯ng ngÆ°á»i chÃºng ta gáº·p
+Äá» Än chÃºng ta Än, nhá»¯ng ngÆ°á»i chÃºng ta gáº·p
 
 4
 00:00:10,180 --> 00:00:12,480

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 4e7578db8a887efc1786894c11aacbfa4cf3a682
Author: Translation commit bot 
Date:   Wed Aug 31 11:17:21 2016 +

Update translations for tor-messenger-authdtd
---
 vi/auth.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vi/auth.dtd b/vi/auth.dtd
index 09b2f5e..1b0c4a5 100644
--- a/vi/auth.dtd
+++ b/vi/auth.dtd
@@ -1,5 +1,5 @@
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 8a449c2a6d29904d5038b4daf8cb6a0f572f1c79
Author: Translation commit bot 
Date:   Wed Aug 31 11:16:23 2016 +

Update translations for abouttor-homepage
---
 vi/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vi/aboutTor.dtd b/vi/aboutTor.dtd
index 3ab6a1b..8a349b5 100644
--- a/vi/aboutTor.dtd
+++ b/vi/aboutTor.dtd
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit b1f0895e976493ea82f204d26396171e99c912bf
Author: Translation commit bot 
Date:   Wed Aug 31 11:16:06 2016 +

Update translations for tor-launcher-progress
---
 vi/progress.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vi/progress.dtd b/vi/progress.dtd
index 305cba3..c4b3b25 100644
--- a/vi/progress.dtd
+++ b/vi/progress.dtd
@@ -1,4 +1,4 @@
 
-
+
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit ed50c7dbec664731d46b930dfc8496049e004515
Author: Translation commit bot 
Date:   Wed Aug 31 11:15:25 2016 +

Update translations for https_everywhere
---
 vi/https-everywhere.dtd | 2 +-
 vi/ssl-observatory.dtd  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vi/https-everywhere.dtd b/vi/https-everywhere.dtd
index b542256..9ab5016 100644
--- a/vi/https-everywhere.dtd
+++ b/vi/https-everywhere.dtd
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 
diff --git a/vi/ssl-observatory.dtd b/vi/ssl-observatory.dtd
index 605f5a5..c631bf4 100644
--- a/vi/ssl-observatory.dtd
+++ b/vi/ssl-observatory.dtd
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 ___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 2d69023b55356a0c25b1e792d3ecf31973bd6a61
Author: Translation commit bot 
Date:   Wed Aug 31 11:15:04 2016 +

Update translations for bridgedb
---
 vi/LC_MESSAGES/bridgedb.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po
index a0a80aa..45f6496 100644
--- a/vi/LC_MESSAGES/bridgedb.po
+++ b/vi/LC_MESSAGES/bridgedb.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-08-31 10:28+\n"
+"PO-Revision-Date: 2016-08-31 10:53+\n"
 "Last-Translator: Acooldude\n"
 "Language-Team: Vietnamese 
(http://www.transifex.com/otf/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgstr "Xin lá»i! CÃ³ gÃ¬ ÄÃ³ khÃ´ng ÄÃºng vá»i yÃªu 
cáº§u cá»§a báº¡n."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr "BaÌo caÌo LÃ´Ìi"
+msgstr "Ghi nháºn má»t lá»i"
 
 #: bridgedb/https/templates/base.html:82
 msgid "Source Code"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 48fecc31bebd2d6832626c1ee2a9f7c472554880
Author: Translation commit bot 
Date:   Wed Aug 31 11:15:12 2016 +

Update translations for torcheck
---
 vi/torcheck.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/vi/torcheck.po b/vi/torcheck.po
index a1ff750..82c4498 100644
--- a/vi/torcheck.po
+++ b/vi/torcheck.po
@@ -2,6 +2,7 @@
 # Copyright (C) 2008-2013 The Tor Project, Inc
 # 
 # Translators:
+# Acooldude, 2016
 # Hoang Thu Giang , 2014
 # Khanh Nguyen , 2015
 # Quoc Hoa, 2014
@@ -9,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: Khanh Nguyen \n"
+"PO-Revision-Date: 2016-08-31 10:48+\n"
+"Last-Translator: Acooldude\n"
 "Language-Team: Vietnamese 
(http://www.transifex.com/otf/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +27,7 @@ msgid ""
 "Please refer to the https://www.torproject.org/\;>Tor website "
 "for further information about using Tor safely.  You are now free to browse "
 "the Internet anonymously."
-msgstr "LÃ m Æ¡n hÃ£y sá» dá»¥ng https://www.torproject.org/\;> 
trang web Tor Äá» cÃ³ thÃªm thÃ´ng tin vá» sá» dá»¥ng Tor má»t cÃ¡ch 
an toÃ n. BÃ¢y giá» báº¡n cÃ³ thá» lÆ°á»t Internet áº©n danh."
+msgstr "HÃ£y tham kháº£o https://www.torproject.org/\;> trang web 
Tor cho nhá»¯ng thÃ´ng tin xa hÆ¡n vá» viá»c sá» dá»¥ng Tor má»t cÃ¡ch 
an toÃ n. BÃ¢y giá» báº¡n cÃ³ thá» tá»± do lÆ°á»t Internet áº©n danh."
 
 msgid "There is a security update available for Tor Browser."
 msgstr ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 218e8a2296bd0cb27f1898f4cebf89921eb7ec38
Author: Translation commit bot 
Date:   Wed Aug 31 10:48:11 2016 +

Update translations for tor-messenger-prefsdtd
---
 vi/prefs.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vi/prefs.dtd b/vi/prefs.dtd
index 28668ff..9e8d2f5 100644
--- a/vi/prefs.dtd
+++ b/vi/prefs.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit fbdfdb4c0cefe0b2fb777ef38911bdabb31605f5
Author: Translation commit bot 
Date:   Wed Aug 31 10:47:45 2016 +

Update translations for tor-messenger-fingerdtd
---
 vi/finger.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vi/finger.dtd b/vi/finger.dtd
index fdc4524..28cb374 100644
--- a/vi/finger.dtd
+++ b/vi/finger.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit b785f438b87c982f33c760dba6d5c33f9e7c244a
Author: Translation commit bot 
Date:   Wed Aug 31 10:47:14 2016 +

Update translations for tor-messenger-authdtd
---
 vi/auth.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vi/auth.dtd b/vi/auth.dtd
index b9066de..09b2f5e 100644
--- a/vi/auth.dtd
+++ b/vi/auth.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit c29e54d9a4958f0022f6f093ec5858afd3f279e8
Author: Translation commit bot 
Date:   Wed Aug 31 10:46:36 2016 +

Update translations for torbutton-torbuttondtd
---
 vi/torbutton.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vi/torbutton.dtd b/vi/torbutton.dtd
index 92c1120..d4157be 100644
--- a/vi/torbutton.dtd
+++ b/vi/torbutton.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit cdbf88754a7d5f411cb9f5d3e2d27224dabee7cb
Author: Translation commit bot 
Date:   Wed Aug 31 10:45:40 2016 +

Update translations for tails-greeter
---
 vi/vi.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/vi/vi.po b/vi/vi.po
index 4973218..0704112 100644
--- a/vi/vi.po
+++ b/vi/vi.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Acooldude, 2016
 # Khanh Nguyen , 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2016-08-24 14:26+0200\n"
+"PO-Revision-Date: 2016-08-31 10:18+\n"
+"Last-Translator: Acooldude\n"
 "Language-Team: Vietnamese 
(http://www.transifex.com/otf/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
 
 #: ../glade/persistencewindow.glade.h:1
 msgid "Forward"
-msgstr "Vá» phÃa trÆ°á»c"
+msgstr "chuyá»n tiáº¿p"
 
 #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
 msgid "Login"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2016-08-31 Thread translation

commit d10e3efca248864ac85aabb52a7454d450777fb7
Author: Translation commit bot 
Date:   Wed Aug 31 10:45:29 2016 +

Update translations for liveusb-creator
---
 vi/vi.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/vi/vi.po b/vi/vi.po
index 226495a..3658f36 100644
--- a/vi/vi.po
+++ b/vi/vi.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Acooldude, 2016
 # Hoang Thu Giang , 2014
 # Khanh Nguyen , 2015
 # Tho Nguyen , 2015
@@ -11,8 +12,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-04-02 15:07+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-08-31 10:41+\n"
+"Last-Translator: Acooldude\n"
 "Language-Team: Vietnamese 
(http://www.transifex.com/otf/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgstr ""
 
 #: ../liveusb/gui.py:451
 msgid "\"Clone & Install\""
-msgstr "\"Táº¡o báº£n sao vÃ  CÃ i Äáº·t\""
+msgstr "\"NhÃ¢n báº£n vÃ  CÃ i Äáº·t\""
 
 #: ../liveusb/gui.py:453
 msgid "\"Install from ISO\""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 9ed82e8cc615bacf24767df87a5ccda2a0eb098f
Author: Translation commit bot 
Date:   Wed Aug 31 10:45:21 2016 +

Update translations for https_everywhere
---
 vi/ssl-observatory.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vi/ssl-observatory.dtd b/vi/ssl-observatory.dtd
index b2ebf17..605f5a5 100644
--- a/vi/ssl-observatory.dtd
+++ b/vi/ssl-observatory.dtd
@@ -1,5 +1,5 @@
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit e543d7518f49c5c0730446bd3a9f3eda7e5dde3e
Author: Translation commit bot 
Date:   Wed Aug 31 10:45:02 2016 +

Update translations for bridgedb
---
 vi/LC_MESSAGES/bridgedb.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po
index 4bd02a2..a0a80aa 100644
--- a/vi/LC_MESSAGES/bridgedb.po
+++ b/vi/LC_MESSAGES/bridgedb.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Acooldude, 2016
 # Khanh Nguyen , 2015
-# lvnam96, 2016
+# VÄn Nam LÃª, 2016
 # Tuan Duc Dang , 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-04-02 14:44+\n"
-"Last-Translator: lvnam96\n"
+"PO-Revision-Date: 2016-08-31 10:28+\n"
+"Last-Translator: Acooldude\n"
 "Language-Team: Vietnamese 
(http://www.transifex.com/otf/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +35,7 @@ msgstr ""
 #. "Tor Browser"
 #: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Xin lá»i! CÃ³ váº¥n ÄÃªÌ vá»i yÃªu cáº§u cá»§a báº¡n."
+msgstr "Xin lá»i! CÃ³ gÃ¬ ÄÃ³ khÃ´ng ÄÃºng vá»i yÃªu cáº§u cá»§a báº¡n."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit f330828c9f9dbc8e9fa75fd43323e38944f3d2ba
Author: Translation commit bot 
Date:   Wed Aug 31 10:45:06 2016 +

Update translations for bridgedb_completed
---
 vi/LC_MESSAGES/bridgedb.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po
index 4bd02a2..a0a80aa 100644
--- a/vi/LC_MESSAGES/bridgedb.po
+++ b/vi/LC_MESSAGES/bridgedb.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Acooldude, 2016
 # Khanh Nguyen , 2015
-# lvnam96, 2016
+# VÄn Nam LÃª, 2016
 # Tuan Duc Dang , 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-04-02 14:44+\n"
-"Last-Translator: lvnam96\n"
+"PO-Revision-Date: 2016-08-31 10:28+\n"
+"Last-Translator: Acooldude\n"
 "Language-Team: Vietnamese 
(http://www.transifex.com/otf/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +35,7 @@ msgstr ""
 #. "Tor Browser"
 #: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Xin lá»i! CÃ³ váº¥n ÄÃªÌ vá»i yÃªu cáº§u cá»§a báº¡n."
+msgstr "Xin lá»i! CÃ³ gÃ¬ ÄÃ³ khÃ´ng ÄÃºng vá»i yÃªu cáº§u cá»§a báº¡n."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 871be76930e95b51aa0e840f45b164c93f528bf8
Author: Translation commit bot 
Date:   Wed Aug 31 10:15:14 2016 +

Update translations for whisperback
---
 vi/vi.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/vi/vi.po b/vi/vi.po
index 6c32b0c..704a9a3 100644
--- a/vi/vi.po
+++ b/vi/vi.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Acooldude, 2016
 # Khanh Nguyen , 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-12-16 19:54+0100\n"
-"PO-Revision-Date: 2016-03-21 16:28+\n"
-"Last-Translator: Khanh Nguyen \n"
+"PO-Revision-Date: 2016-08-31 10:05+\n"
+"Last-Translator: Acooldude\n"
 "Language-Team: Vietnamese 
(http://www.transifex.com/otf/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgstr ""
 #: ../whisperBack/whisperback.py:56
 #, python-format
 msgid "Invalid contact email: %s"
-msgstr "ThÆ° Äiá»n tá» liÃªn há» khÃ´ng ÄÃºng: %s"
+msgstr "Email liÃªn láº¡c khÃ´ng há»£p lá»: %s"
 
 #: ../whisperBack/whisperback.py:73
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-lib/master] Added hints about new jar location to README.md and CHANGELOG.md.

2016-08-31 Thread karsten

commit 799fc259b287fe9bd5288f97cac7d121327202d7
Author: iwakeh 
Date:   Wed Aug 31 08:52:40 2016 +0200

Added hints about new jar location to README.md and CHANGELOG.md.
---
 CHANGELOG.md | 1 +
 README.md| 8 
 2 files changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4eef28..98f1781 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
  * Minor changes
- Include resource files in src/*/resources/ in the release
  tarball.
+   - Move executable, source, and javadoc jar to generated/dist/.
 
 
 # Changes in version 1.3.1 - 2016-08-01
diff --git a/README.md b/README.md
index 764f143..2208379 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,14 @@ running, batch-processing applications and not for 
continuously running
 applications that rely on learning about changes to an underlying
 descriptor source.
 
+The executable jar, source jar, and javadoc jar can be found in
+
+```
+generated/dist/
+```
+
+Before using them please verify the release (see below for instructions).
+
 
 Verifying releases
 --



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-lib/master] Prepare for 1.4.0 release.

2016-08-31 Thread karsten

commit adf4a677028724e2430de69d67d8a52224fc4de6
Author: Karsten Loesing 
Date:   Wed Aug 31 10:29:08 2016 +0200

Prepare for 1.4.0 release.
---
 CERT | 35 +++
 CHANGELOG.md |  2 +-
 CONTRIB.md   |  2 +-
 build.xml|  9 -
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/CERT b/CERT
index eaeef50..ebe19a7 100644
--- a/CERT
+++ b/CERT
@@ -1,18 +1,21 @@
 -BEGIN CERTIFICATE-
-MIIDbTCCAlWgAwIBAgIEca8MxDANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCTUExEjAQBgNVBAcTCUNhbWJyaWRnZTEdMBsGA1UEChMUVGhlIFRvciBQcm9qZWN0LCBJbmMx
-GDAWBgNVBAMTD0thcnN0ZW4gTG9lc2luZzAeFw0xNjA1MzExODIwMjlaFw0xNjA4MjkxODIwMjla
-MGcxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNQTESMBAGA1UEBxMJQ2FtYnJpZGdlMR0wGwYDVQQK
-ExRUaGUgVG9yIFByb2plY3QsIEluYzEYMBYGA1UEAxMPS2Fyc3RlbiBMb2VzaW5nMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgJCqHFgEhyj8AI4w93YcyZEkKwn2Jw5t7bYcaLieP0wa
-Ai2xrRFROo0eofjIllPlYTFtj9jLAZf+MQ1/Sdv7SLdlpasBCS0deTGlxuMzyMP9ztkkkAeibc+F
-IXYPJArwGJiycnd+obW8b8KNrJQsnb0Se5Fdgo/PSu1rqMh/Mylv9vLqUzB4hbN4bg5+7THlTAOK
-egYyR0NEPDzi327MAvzzle27kXV9yOCQr01zXW9NeWYed6JMXCZwaMN6nTVEFiwTfAyATfPncarf
-gZ1kyAkQ6/Sw2bGMv8jHqB63Ka0/6GXHRbFgCeWU+c/1sfEMBD3ZurEjwSjWGl73E4GBswIDAQAB
-oyEwHzAdBgNVHQ4EFgQUJbu6UT97IU4utjyc4zYUrLIgzvQwDQYJKoZIhvcNAQELBQADggEBAHOF
-jMP0rNa+cKy8beEpU0VRZ1RNLb70BoFjXZvzgv92MGnojg509fYO3PgzXUZv5v50VenexZjeZ9to
-iiqw5zDelg1maVSZwKrQVgFIwXnP4+okIcPMtFjSNiF9VyhRd8OE3U/kpIBdecMVIEhCIKOaF/nq
-uBwilXAK7VwYN7hQgKbIODoX9Y3dr9QDvrILkFDEmOudmDRo+RePAKJum+/E0RuUYjOeXpFmzXOf
-5LJ/Y4hMKuLfuxoWasHOV0IRx///CNgF1L287TCyjrYUbEjWwMtFQc0NRjedhcWUzwXLpbk2unxM
-j6ElkADaczDG20ZGSgrFfU4MYb1RFeQu6yk=
+MIIDaTCCAlGgAwIBAgIEc2oU6DANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV
+UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU
+b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTYw
+ODMxMDgzMTIyWhcNMTYxMTI5MDgzMTIyWjBlMQswCQYDVQQGEwJVUzELMAkGA1UE
+CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj
+dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU
+6aTpAjDMeaT4ctUwxH4+56Sbcf/wB0vEFBbX8MyRd1eY02PKwMVJ6VBhjOQcIlrd
+Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE
+MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD
+oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX
+lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud
+DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAUFNO
+VyxE1ej/+5Q91tm8wCcFZYJRSVhQ6lqVs7kfNd6ggCUno8e8xnV3+nhNpT6vjc6g
+gGlOQKRPR2sNw2aDoXWtPa7h1DUtD4GeWU16kg9YTBNw9+Yay9jWQUKOs3hd86T5
+8xsndvmWuYf/jyW/B+k5f9u7ZQ3LWM2fwXYFiZmd+i7rDJJV8YEECkHRJMaZKB+B
+0CJ3Jfv57qsgqmvskqP+FmwmQz91mNn0iAUtpZoojqhzRhjr0/5VoqmbxeVeBhdI
+3YRZW/FkC/1hbu1CgrtRXoDu+fChyrvpLjqgTuCaBYmfjVOajq0F9GmhNkuMtZgw
+nLPNRMoyiTx/z4VFpg==
 -END CERTIFICATE-
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98f1781..232049e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 1.4.0 - 2016-08-24
+# Changes in version 1.4.0 - 2016-08-31
 
  * Major changes
- Add the Simple Logging Facade for Java (slf4j) for logging
diff --git a/CONTRIB.md b/CONTRIB.md
index 3120193..39f59a1 100644
--- a/CONTRIB.md
+++ b/CONTRIB.md
@@ -171,7 +171,7 @@ parameters:
 ```
 keytool -genkeypair -alias karsten -keyalg RSA -keysize 2048 \
 -sigalg SHA256withRSA -validity 90 \
--dname "CN=Karsten Loesing, O=The Tor Project\, Inc, L=Cambridge, ST=MA, 
C=US"
+-dname "CN=Karsten Loesing, O=The Tor Project\, Inc, L=Seattle, ST=WA, 
C=US"
 ```
 
 Extend the certificate for the existing key pair when it expires:
diff --git a/build.xml b/build.xml
index cee61ed..52f88c3 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 
-  
+  
   
   
   
@@ -227,11 +227,10 @@
  storepass="${jarsigner.storepass}"
  sigalg="SHA256withRSA"
  digestalg="SHA-256"
- tsaurl="http://timestamp.digicert.com;>
+ tsaurl="http://timestamp.digicert.com;
+ lazy="true">
   
-
-
-
+
   
 
   



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-lib/master] Bump version to 1.4.0-dev.

2016-08-31 Thread karsten

commit 38b18e3520ac0adfc7ea4f15332a66fce8f21e5c
Author: Karsten Loesing 
Date:   Wed Aug 31 11:02:14 2016 +0200

Bump version to 1.4.0-dev.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 52f88c3..c1e3296 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 
-  
+  
   
   
   

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2016-08-31 Thread translation

commit 9c986b99d78e6957085dd3df656bd56b11382e8b
Author: Translation commit bot 
Date:   Wed Aug 31 06:18:16 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 de/prefs.dtd | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/de/prefs.dtd b/de/prefs.dtd
index 71e7d6e..6ccfa5a 100644
--- a/de/prefs.dtd
+++ b/de/prefs.dtd
@@ -1,5 +1,6 @@
 
 
+
 
 
 
@@ -11,4 +12,11 @@
 
 
 
-
\ No newline at end of file
+
+
+
+
+
+
+
+
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

66 matches

Mail list logo