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

2016-10-05 Thread translation 
commit 347e5fcc83f7050698b038a6edd8283e3358d92f
Author: Translation commit bot 
Date:   Thu Oct 6 05:15:03 2016 +

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

diff --git a/hi/LC_MESSAGES/bridgedb.po b/hi/LC_MESSAGES/bridgedb.po
index c0a9700..f86bc76 100644
--- a/hi/LC_MESSAGES/bridgedb.po
+++ b/hi/LC_MESSAGES/bridgedb.po
@@ -5,14 +5,15 @@
 # Translators:
 # A. Saad Imran, 2016
 # Bineet kumar gaur , 2014
+# Minnie Kaur , 2016
 # Shubham Singh , 2016
 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-07-21 01:36+\n"
-"Last-Translator: A. Saad Imran\n"
+"PO-Revision-Date: 2016-10-06 05:00+\n"
+"Last-Translator: Minnie Kaur \n"
 "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -261,7 +262,7 @@ msgstr ""
 
 #: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr ""
+msgstr "मैं पुलों होने का एक 
वैकल्पिक तरीका की जरूरत है!"
 
 #: bridgedb/strings.py:108
 #, python-format

___
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-10-05 Thread translation 
commit f0fab3063650a581457b329f538903e2ca716dd1
Author: Translation commit bot 
Date:   Wed Oct 5 21:46:33 2016 +

Update translations for torbutton-torbuttondtd
---
 sv/torbutton.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/torbutton.dtd b/sv/torbutton.dtd
index c4ff384..d5d3657 100644
--- a/sv/torbutton.dtd
+++ b/sv/torbutton.dtd
@@ -27,11 +27,11 @@
 
 
 
-
+
 
 
 
-
+
 
 
 

___
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 a patch for trac 17480

2016-10-05 Thread arlo 
commit 233e7b23770f4c89d637e0db4d23ca2d6f0a512a
Author: Arlo Breault 
Date:   Wed Oct 5 11:15:03 2016 -0700

Add a patch for trac 17480

 * Make url linkification toggleable
---
 ChangeLog|  1 +
 projects/instantbird/disable-links.patch | 90 +++-
 2 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 2c94d2f..5b309f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Tor Messenger 0.2.0b3 --
* Bug 20208: Put conversations on hold by default
* Properly handle incoming xmpp server messages (bugzilla 1246431)
* Bug 20276: Fix toggling sounds
+   * Bug 17480: Make url linkification toggleable
  * Mac
* Bug 20206: Avoid prompting to download font "Osaka" on macOS Sierra
* Bug 20204: Windows don't drag on macOS Sierra
diff --git a/projects/instantbird/disable-links.patch 
b/projects/instantbird/disable-links.patch
index 41b23c4..1b559e6 100644
--- a/projects/instantbird/disable-links.patch
+++ b/projects/instantbird/disable-links.patch
@@ -1,7 +1,19 @@
+From f4b2401ec1f431ea9b90ac0c86106714a94cc3bc Mon Sep 17 00:00:00 2001
+From: Arlo Breault 
+Date: Wed, 5 Oct 2016 11:09:25 -0700
+Subject: [PATCH] A patch for trac 17480
+
+ * url linkification
+---
+ chat/modules/imContentSink.jsm | 30 +-
+ im/content/preferences/content.xul |  2 +-
+ 2 files changed, 6 insertions(+), 26 deletions(-)
+
 diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm
+index e03c5bb..895ab88 100644
 --- a/chat/modules/imContentSink.jsm
 +++ b/chat/modules/imContentSink.jsm
-@@ -59,10 +59,6 @@
+@@ -59,10 +59,6 @@ var kStrictMode = {
attrs: { },
  
tags: {
@@ -12,3 +24,79 @@ diff --git a/chat/modules/imContentSink.jsm 
b/chat/modules/imContentSink.jsm
  'br': true,
  'p': true
},
+@@ -72,12 +68,9 @@ var kStrictMode = {
+ 
+ // standard mode allows basic formattings (bold, italic, underlined)
+ var kStandardMode = {
+-  attrs: {
+-'style': true
+-  },
++  attrs: { },
+ 
+   tags: {
+-'div': true,
+ 'a': {
+   'title': true,
+   'href': kAllowedURLs
+@@ -87,24 +80,11 @@ var kStandardMode = {
+ 'b': true,
+ 'i': true,
+ 'u': true,
+-'span': {
+-  'class': kAllowedMozClasses
+-},
+ 'br': true,
+-'code': true,
+-'ul': true,
+-'li': true,
+-'ol': true,
+-'cite': true,
+-'blockquote': true,
+ 'p': true
+   },
+ 
+-  styles: {
+-'font-style': true,
+-'font-weight': true,
+-'text-decoration-line': true
+-  }
++  styles: { }
+ };
+ 
+ // permissive mode allows about anything that isn't going to mess up the chat 
window
+@@ -158,7 +138,7 @@ var kPermissiveMode = {
+ };
+ 
+ var kModePref = "messenger.options.filterMode";
+-var kModes = [kStrictMode, kStandardMode, kPermissiveMode];
++var kModes = [kStrictMode, kStandardMode];
+ 
+ var gGlobalRuleset = null;
+ 
+@@ -184,8 +164,8 @@ var styleObserver = {
+ function getModePref()
+ {
+   let baseNum = Services.prefs.getIntPref(kModePref);
+-  if (baseNum < 0 || baseNum > 2)
+-baseNum = 1;
++  if (baseNum < 0 || baseNum > 1)
++baseNum = 0;
+ 
+   return kModes[baseNum];
+ }
+diff --git a/im/content/preferences/content.xul 
b/im/content/preferences/content.xul
+index 3b8ccfa..ba41da7 100644
+--- a/im/content/preferences/content.xul
 b/im/content/preferences/content.xul
+@@ -35,7 +35,7 @@
+   
+   
+ 
+-  
++  
+   
+   
+ 
+-- 
+2.10.1
+

___
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-10-05 Thread translation 
commit 5e7a8ad5d3683afcea29322a927b445337ca763f
Author: Translation commit bot 
Date:   Wed Oct 5 21:16:32 2016 +

Update translations for torbutton-torbuttondtd
---
 sv/torbutton.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/torbutton.dtd b/sv/torbutton.dtd
index 781b692..c4ff384 100644
--- a/sv/torbutton.dtd
+++ b/sv/torbutton.dtd
@@ -25,7 +25,7 @@
 
 
 
-
+
 
 
 
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 

___
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-10-05 Thread translation 
commit 7661507f7d19e8791ff348b333c2ae5afabfa993
Author: Translation commit bot 
Date:   Wed Oct 5 17:48:08 2016 +

Update translations for tor-messenger-prefsdtd
---
 ja/prefs.dtd | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ja/prefs.dtd b/ja/prefs.dtd
index c456d0f..f56c98a 100644
--- a/ja/prefs.dtd
+++ b/ja/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] [translation/tor-messenger-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed

2016-10-05 Thread translation 
commit c52ab872ab7a1ceb7fc37e43fdecdb21d873a74f
Author: Translation commit bot 
Date:   Wed Oct 5 17:48:21 2016 +

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

diff --git a/ja/prefs.dtd b/ja/prefs.dtd
index 8a3ffe3..f56c98a 100644
--- a/ja/prefs.dtd
+++ b/ja/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/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2016-10-05 Thread translation 
commit 932775967b44a6e5d433b5df68434aba35cab296
Author: Translation commit bot 
Date:   Wed Oct 5 17:46:33 2016 +

Update translations for torbutton-torbuttondtd
---
 ja/torbutton.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ja/torbutton.dtd b/ja/torbutton.dtd
index f330ab7..ed08264 100644
--- a/ja/torbutton.dtd
+++ b/ja/torbutton.dtd
@@ -25,15 +25,15 @@
 
 
 
-
+
 
-
+
 
-
+
 
-
+
 
-
+
 
 
 

___
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-10-05 Thread translation 
commit bd6ec55a2f25a1f666c7ee20c680da55171a6f25
Author: Translation commit bot 
Date:   Wed Oct 5 17:16:33 2016 +

Update translations for torbutton-torbuttondtd
---
 ja/torbutton.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ja/torbutton.dtd b/ja/torbutton.dtd
index 4743927..f330ab7 100644
--- a/ja/torbutton.dtd
+++ b/ja/torbutton.dtd
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 
@@ -51,7 +51,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [tor/master] dircollate: Use correct tor_calloc args.

2016-10-05 Thread nickm 
commit fdc0a660b476fea19d8b4f7739aba05704d25bbe
Author: Muhammad Falak R Wani 
Date:   Wed Oct 5 01:32:58 2016 +0530

dircollate: Use correct tor_calloc args.

Flip the tor_calloc arguments in the call.

Signed-off-by: Muhammad Falak R Wani 
---
 src/or/dircollate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/dircollate.c b/src/or/dircollate.c
index 756011b..c6afd95 100644
--- a/src/or/dircollate.c
+++ b/src/or/dircollate.c
@@ -87,7 +87,7 @@ dircollator_add_routerstatus(dircollator_t *dc,
   (void) vote;
   vote_routerstatus_t **vrs_lst = digestmap_get(dc->by_rsa_sha1, id);
   if (NULL == vrs_lst) {
-vrs_lst = tor_calloc(sizeof(vote_routerstatus_t *), dc->n_votes);
+vrs_lst = tor_calloc(dc->n_votes, sizeof(vote_routerstatus_t *));
 digestmap_set(dc->by_rsa_sha1, id, vrs_lst);
   }
   tor_assert(vrs_lst[vote_num] == NULL);

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

[tor-commits] [tor-browser-bundle/maint-6.0] Bug 20290: Upgrade meek to 0.24.

2016-10-05 Thread gk 
commit c8e727d5b00af25194cde2577a45b68bcb31f7ca
Author: David Fifield 
Date:   Mon Oct 3 19:26:11 2016 -0700

Bug 20290: Upgrade meek to 0.24.

This version has a fix for https://bugs.torproject.org/20030.
(meek-client-torbrowser failing to kill is subprocesses, which was a
problem whenever meek-client-torbrowser was built with Go 1.6 or later.)
---
 gitian/versions | 2 +-
 gitian/versions.alpha   | 2 +-
 gitian/versions.nightly | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index 16d9553..170e6df 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -33,7 +33,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 
0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.5
-MEEK_TAG=0.22-18371-3
+MEEK_TAG=0.24
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 7efe5d8..97cf78f 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -33,7 +33,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 
0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.5
-MEEK_TAG=0.22-18371-3
+MEEK_TAG=0.24
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 67c7d99..22e9742 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -40,7 +40,7 @@ FTEPROXY_TAG=master
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=master
-MEEK_TAG=0.22-18371-3 #master
+MEEK_TAG=0.24
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd

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

[tor-commits] [tor-browser-bundle/hardened-builds] Bug 20290: Upgrade meek to 0.24.

2016-10-05 Thread gk 
commit 40fd8cb1c914996adb817bf961ed23d1e5eb4856
Author: David Fifield 
Date:   Mon Oct 3 19:26:11 2016 -0700

Bug 20290: Upgrade meek to 0.24.

This version has a fix for https://bugs.torproject.org/20030.
(meek-client-torbrowser failing to kill is subprocesses, which was a
problem whenever meek-client-torbrowser was built with Go 1.6 or later.)
---
 gitian/versions | 4 ++--
 gitian/versions.alpha   | 2 +-
 gitian/versions.nightly | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index 6ab0f2d..d276d33 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -28,8 +28,8 @@ LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch 
master with fix
 FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
-GOPTLIB_TAG=0.2
-MEEK_TAG=0.20
+GOPTLIB_TAG=0.5
+MEEK_TAG=0.24
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index e12110e..295439e 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -37,7 +37,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 
0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.5
-MEEK_TAG=0.22-18371-3
+MEEK_TAG=0.24
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 99e476e..ab47af1 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -40,7 +40,7 @@ FTEPROXY_TAG=master
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=master
-MEEK_TAG=0.22-18371-3 #master
+MEEK_TAG=0.24
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd

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

[tor-commits] [tor-browser-bundle/master] Bug 20290: Upgrade meek to 0.24.

2016-10-05 Thread gk 
commit a933bb826a463fa8372fe1e5ed372a3390b1db31
Author: David Fifield 
Date:   Mon Oct 3 19:26:11 2016 -0700

Bug 20290: Upgrade meek to 0.24.

This version has a fix for https://bugs.torproject.org/20030.
(meek-client-torbrowser failing to kill is subprocesses, which was a
problem whenever meek-client-torbrowser was built with Go 1.6 or later.)
---
 gitian/versions | 2 +-
 gitian/versions.alpha   | 2 +-
 gitian/versions.nightly | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index 4ee6f20..ef57d6a 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -33,7 +33,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 
0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.5
-MEEK_TAG=0.22-18371-3
+MEEK_TAG=0.24
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 464f917..898e781 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -33,7 +33,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 
0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.5
-MEEK_TAG=0.22-18371-3
+MEEK_TAG=0.24
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 3b90c88..f6dbb68 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -40,7 +40,7 @@ FTEPROXY_TAG=master
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=master
-MEEK_TAG=0.22-18371-3 #master
+MEEK_TAG=0.24
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd

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

[tor-commits] [tor-browser-bundle/master] Bug 20182: Handle the special case of the ja locale in dmg2mar

2016-10-05 Thread gk 
commit 3993fb0ee7624b8c0daaefcd9f08d1ccf0a048e1
Author: Nicolas Vigier 
Date:   Tue Oct 4 20:21:51 2016 +0200

Bug 20182: Handle the special case of the ja locale in dmg2mar
---
 tools/dmg2mar | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/dmg2mar b/tools/dmg2mar
index 47a543a..010761e 100755
--- a/tools/dmg2mar
+++ b/tools/dmg2mar
@@ -98,7 +98,11 @@ sub convert_files {
 my $pm = Parallel::ForkManager->new(get_nbprocs);
 $pm->run_on_finish(sub { print "Finished $_[2]\n" });
 foreach my $file (get_dmg_files_from_sha256sums) {
-my $output = "tor-browser-osx64-$file->{version}_$file->{lang}.mar";
+# The 'ja' locale is a special case: it is called 'ja-JP-mac'
+# internally on OSX, but the dmg file still uses 'ja' to avoid
+# confusing users.
+my $mar_lang = $file->{lang} eq 'ja' ? 'ja-JP-mac' : $file->{lang};
+my $output = "tor-browser-osx64-$file->{version}_$mar_lang.mar";
 my $step_name = "$file->{filename} -> $output";
 print "Starting $step_name\n";
 $pm->start($step_name) and next;

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