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

2016-01-26 Thread translation 
commit 94d5873ac961f760938e16c5e8a49133aa9ad312
Author: Translation commit bot 
Date:   Tue Jan 26 10:45:38 2016 +

Update translations for tor-launcher-progress_completed
---
 nl/progress.dtd |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nl/progress.dtd b/nl/progress.dtd
index 89b7b7c..d6aae9d 100644
--- a/nl/progress.dtd
+++ b/nl/progress.dtd
@@ -1,4 +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-launcher-progress] Update translations for tor-launcher-progress

2016-01-26 Thread translation 
commit 3cba51f532e6f8f09f5bcfb1dd3f555281e55a62
Author: Translation commit bot 
Date:   Tue Jan 26 10:45:34 2016 +

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

diff --git a/nl/progress.dtd b/nl/progress.dtd
index fb513ad..d6aae9d 100644
--- a/nl/progress.dtd
+++ b/nl/progress.dtd
@@ -1,4 +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-launcher-network-settings] Update translations for tor-launcher-network-settings

2016-01-26 Thread translation 
commit 8750ca1cc399b3614498566cef4381196363ca15
Author: Translation commit bot 
Date:   Tue Jan 26 10:45:43 2016 +

Update translations for tor-launcher-network-settings
---
 nl/network-settings.dtd |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nl/network-settings.dtd b/nl/network-settings.dtd
index ab35d6b..af1ea16 100644
--- a/nl/network-settings.dtd
+++ b/nl/network-settings.dtd
@@ -13,9 +13,9 @@
 
 
 
-
+
 
-
+
 
 
 
@@ -27,15 +27,15 @@
 
 
 
-
-
+
+
 
 
 
 
 
 
-
+
 
 
 

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

[tor-commits] [orbot/master] update changelog for v15.10 RC-5

2016-01-26 Thread n8fr8 
commit 2ae22ec3e4af73cd94bd7451d693a5d4c7fbf2e8
Author: Nathan Freitas 
Date:   Tue Jan 26 03:43:30 2016 -0500

update changelog for v15.10 RC-5
---
 CHANGELOG |7 +++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c43383c..f5a45a1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,12 @@
 NOTE: Specific #s below correspond to Trac tickets logged and maintained at 
https://trac.torproject.org/projects/tor/
 
+
+/** 15.1.0-RC-5 / 26-January-2016 / 33fa19f9894c44879d81bc3fb578eb4e9b134b8f 
**/
+
+* da7eb96 small fixes to VPN service port setup to ensure proper setup
+* ec6083f add 'Mosaddegh','Azadi','MaBishomarim' & 'JonbesheSabz' to default 
bridges
+* 8a00ab1 remove extra chars from bridge line. fixes #18148
+
 /** 15.1.0-RC-4 / 25-January-2016 / 80491ea95bd62346bf3f3a579d3302dbd84f4ca9 
**/
 
 Improve Bridge selection to support built-in default bridges

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

[tor-commits] [orbot/master] 15.1.0-RC-5

2016-01-26 Thread n8fr8 
commit 33fa19f9894c44879d81bc3fb578eb4e9b134b8f
Author: Nathan Freitas 
Date:   Tue Jan 26 03:42:24 2016 -0500

15.1.0-RC-5
---
 AndroidManifest.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d31c227..db30380 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 
 http://schemas.android.com/apk/res/android;
   package="org.torproject.android" 
-  android:versionName="15.1.0-RC-4" 
-  android:versionCode="15100024"
+  android:versionName="15.1.0-RC-5" 
+  android:versionCode="15100025"
 android:installLocation="auto"  
   >




___
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] Bump nightly versions for hardened-builds

2016-01-26 Thread gk 
commit 9b4dfc9dbed50b4012caa70aae56e6b5d3cb9c0d
Author: Georg Koppen 
Date:   Tue Jan 26 13:54:43 2016 +

Bump nightly versions for hardened-builds
---
 gitian/versions.nightly |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index d209c6a..44e4ddb 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -14,11 +14,11 @@ MULTI_LINGUAL=1
 
 VERIFY_TAGS=0
 
-FIREFOX_VERSION=38.5.0esr
+FIREFOX_VERSION=38.6.0esr
 
 TORBROWSER_UPDATE_CHANNEL=default
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1
 TOR_TAG=master
 TORLAUNCHER_TAG=master
 TORBUTTON_TAG=master
@@ -48,7 +48,7 @@ GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux
 OPENSSL_VER=1.0.1q
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
-FIREFOX_LANG_BUILD=build2
+FIREFOX_LANG_BUILD=build1
 BINUTILS_VER=2.24
 GCC_VER=5.2.0
 PYTHON_VER=2.7.5
@@ -67,7 +67,7 @@ NOTOCJKFONT_VER=1.004
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.9-sm+fx+fn.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.2-sm+fx+fn.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
@@ -97,7 +97,7 @@ 
OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
 
OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=7d67363b10708ef816d786e99d035a16a41eee8c8c1b3c87e4544717b066db71
+NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

___
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/bug18145'

2016-01-26 Thread nickm 
commit 42dea56363c24960e85344749644f6502f625463
Merge: 0010b80 4339fa5
Author: Nick Mathewson 
Date:   Tue Jan 26 10:01:34 2016 -0500

Merge remote-tracking branch 'teor/bug18145'

 src/or/circuituse.c|   28 ++--
 src/or/config.c|2 +-
 src/or/connection.c|2 +-
 src/or/connection_or.c |4 ++--
 src/or/directory.c |2 +-
 src/or/entrynodes.c|2 +-
 src/or/ext_orport.c|2 +-
 src/or/or.h|   42 --
 src/or/relay.c |2 +-
 src/or/rendclient.c|   15 ---
 src/or/rendmid.c   |9 +
 src/or/rendservice.c   |4 ++--
 src/or/router.c|2 +-
 src/or/transports.c|2 +-
 14 files changed, 63 insertions(+), 55 deletions(-)

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

[tor-commits] [tor/master] Replace "Alice" with "the client" in a hidden service log message

2016-01-26 Thread nickm 
commit 4339fa560934de09dbe22c7615f68ed46ba3444c
Author: teor (Tim Wilson-Brown) 
Date:   Tue Jan 26 13:49:16 2016 +1100

Replace "Alice" with "the client" in a hidden service log message
---
 src/or/circuituse.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 0a3fee6..05201a5 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1642,7 +1642,7 @@ circuit_build_failed(origin_circuit_t *circ)
   /* Don't increment failure count, since the client may have picked
* the rendezvous point maliciously */
   log_info(LD_REND,
-   "Couldn't connect to Alice's chosen rend point %s "
+   "Couldn't connect to the client's chosen rend point %s "
"(%s hop failed).",
escaped(build_state_get_exit_nickname(circ->build_state)),
failed_at_last_hop?"last":"non-last");



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

[tor-commits] [tor/master] Correct grammatical errors in tor comments

2016-01-26 Thread nickm 
commit c927b6cb1aff4588a5f3729f8cc919ef3616d73e
Author: teor (Tim Wilson-Brown) 
Date:   Tue Jan 26 13:45:01 2016 +1100

Correct grammatical errors in tor comments

Avoid using gender for things that don't have it.

Avoid assigning a gender to tor users.
---
 src/or/circuituse.c|2 +-
 src/or/config.c|2 +-
 src/or/connection.c|2 +-
 src/or/connection_or.c |4 ++--
 src/or/directory.c |2 +-
 src/or/entrynodes.c|2 +-
 src/or/ext_orport.c|2 +-
 src/or/relay.c |2 +-
 src/or/transports.c|2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index e742a56..a6fffdf 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -2241,7 +2241,7 @@ consider_recording_trackhost(const entry_connection_t 
*conn,
   char fp[HEX_DIGEST_LEN+1];
 
   /* Search the addressmap for this conn's destination. */
-  /* If he's not in the address map.. */
+  /* If they're not in the address map.. */
   if (!options->TrackHostExits ||
   addressmap_have_mapping(conn->socks_request->address,
   options->TrackHostExitsExpire))
diff --git a/src/or/config.c b/src/or/config.c
index 8ee1634..d2d8815 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1517,7 +1517,7 @@ options_act(const or_options_t *old_options)
 #endif
 
   /* If we are a bridge with a pluggable transport proxy but no
- Extended ORPort, inform the user that she is missing out. */
+ Extended ORPort, inform the user that they are missing out. */
   if (server_mode(options) && options->ServerTransportPlugin &&
   !options->ExtORPort_lines) {
 log_notice(LD_CONFIG, "We use pluggable transports but the Extended "
diff --git a/src/or/connection.c b/src/or/connection.c
index c003104..efe804d 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1440,7 +1440,7 @@ connection_handle_listener_read(connection_t *conn, int 
new_type)
   if (!SOCKET_OK(news)) { /* accept() error */
 int e = tor_socket_errno(conn->s);
 if (ERRNO_IS_ACCEPT_EAGAIN(e)) {
-  return 0; /* he hung up before we could accept(). that's fine. */
+  return 0; /* they hung up before we could accept(). that's fine. */
 } else if (ERRNO_IS_RESOURCE_LIMIT(e)) {
   warn_too_many_conns();
   return 0;
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 73e4d19..d778eb3 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1581,7 +1581,7 @@ connection_or_nonopen_was_started_here(or_connection_t 
*conn)
 }
 
 /** Conn just completed its handshake. Return 0 if all is well, and
- * return -1 if he is lying, broken, or otherwise something is wrong.
+ * return -1 if they are lying, broken, or otherwise something is wrong.
  *
  * If we initiated this connection (started_here is true), make sure
  * the other side sent a correctly formed certificate. If I initiated the
@@ -1754,7 +1754,7 @@ connection_or_client_used(or_connection_t *conn)
  *
  * Make sure we are happy with the person we just handshaked with.
  *
- * If he initiated the connection, make sure he's not already connected,
+ * If they initiated the connection, make sure they're not already connected,
  * then initialize conn from the information in router.
  *
  * If all is successful, call circuit_n_conn_done() to handle events
diff --git a/src/or/directory.c b/src/or/directory.c
index e1bdcb0..c1fa37f 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -715,7 +715,7 @@ connection_dir_request_failed(dir_connection_t *conn)
 return; /* this was a test fetch. don't retry. */
   }
   if (!entry_list_is_constrained(get_options()))
-router_set_status(conn->identity_digest, 0); /* don't try him again */
+router_set_status(conn->identity_digest, 0); /* don't try this one again */
   if (conn->base_.purpose == DIR_PURPOSE_FETCH_SERVERDESC ||
  conn->base_.purpose == DIR_PURPOSE_FETCH_EXTRAINFO) {
 log_info(LD_DIR, "Giving up on serverdesc/extrainfo fetch from "
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index bf71fc3..789c53d 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -1152,7 +1152,7 @@ choose_random_entry_impl(cpath_build_state_t *state, int 
for_directory,
   } else {
 /* Try to have at least 2 choices available. This way we don't
  * get stuck with a single live-but-crummy entry and just keep
- * using him.
+ * using it.
  * (We might get 2 live-but-crummy entry guards, but so be it.) */
 preferred_min = 2;
   }
diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c
index f159f7d..810fa0d 100644
--- a/src/or/ext_orport.c
+++ b/src/or/ext_orport.c
@@ -151,7 +151,7 @@ init_ext_or_cookie_authentication(int is_enabled)
 }
 
 /** Read data from conn and see if the client sent us the
- *  authentication type that she prefers to use in this session.
+ *  authentication type that they prefer to use

[tor-commits] [tor/master] Replace Alice/Bob with client/service in hidden service comments

2016-01-26 Thread nickm 
commit fb939ed82e2b913850e9ba2be1b497a7002c97d0
Author: teor (Tim Wilson-Brown) 
Date:   Tue Jan 26 13:48:31 2016 +1100

Replace Alice/Bob with client/service in hidden service comments
---
 src/or/circuituse.c  |   24 
 src/or/or.h  |   42 --
 src/or/rendclient.c  |   15 ---
 src/or/rendmid.c |9 +
 src/or/rendservice.c |4 ++--
 5 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index a6fffdf..0a3fee6 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -92,7 +92,7 @@ circuit_is_acceptable(const origin_circuit_t *origin_circ,
   /* decide if this circ is suitable for this conn */
 
   /* for rend circs, circ->cpath->prev is not the last router in the
-   * circuit, it's the magical extra bob hop. so just check the nickname
+   * circuit, it's the magical extra service hop. so just check the nickname
* of the one we meant to finish at.
*/
   build_state = origin_circ->build_state;
@@ -1493,11 +1493,11 @@ circuit_has_opened(origin_circuit_t *circ)
   circuit_try_attaching_streams(circ);
   break;
 case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO:
-  /* at Bob, waiting for introductions */
+  /* at the service, waiting for introductions */
   rend_service_intro_has_opened(circ);
   break;
 case CIRCUIT_PURPOSE_S_CONNECT_REND:
-  /* at Bob, connecting to rend point */
+  /* at the service, connecting to rend point */
   rend_service_rendezvous_has_opened(circ);
   break;
 case CIRCUIT_PURPOSE_TESTING:
@@ -1617,29 +1617,29 @@ circuit_build_failed(origin_circuit_t *circ)
   circuit_testing_failed(circ, failed_at_last_hop);
   break;
 case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO:
-  /* at Bob, waiting for introductions */
+  /* at the service, waiting for introductions */
   if (circ->base_.state != CIRCUIT_STATE_OPEN) {
 circuit_increment_failure_count();
   }
-  /* no need to care here, because bob will rebuild intro
+  /* no need to care here, because the service will rebuild intro
* points periodically. */
   break;
 case CIRCUIT_PURPOSE_C_INTRODUCING:
-  /* at Alice, connecting to intro point */
-  /* Don't increment failure count, since Bob may have picked
+  /* at the client, connecting to intro point */
+  /* Don't increment failure count, since the service may have picked
* the introduction point maliciously */
-  /* Alice will pick a new intro point when this one dies, if
+  /* The client will pick a new intro point when this one dies, if
* the stream in question still cares. No need to act here. */
   break;
 case CIRCUIT_PURPOSE_C_ESTABLISH_REND:
-  /* at Alice, waiting for Bob */
+  /* at the client, waiting for the service */
   circuit_increment_failure_count();
-  /* Alice will pick a new rend point when this one dies, if
+  /* the client will pick a new rend point when this one dies, if
* the stream in question still cares. No need to act here. */
   break;
 case CIRCUIT_PURPOSE_S_CONNECT_REND:
-  /* at Bob, connecting to rend point */
-  /* Don't increment failure count, since Alice may have picked
+  /* at the service, connecting to rend point */
+  /* Don't increment failure count, since the client may have picked
* the rendezvous point maliciously */
   log_info(LD_REND,
"Couldn't connect to Alice's chosen rend point %s "
diff --git a/src/or/or.h b/src/or/or.h
index 52bf337..103e76d 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -458,9 +458,11 @@ typedef enum {
 #define CIRCUIT_PURPOSE_OR_MIN_ 1
 /** OR-side circuit purpose: normal circuit, at OR. */
 #define CIRCUIT_PURPOSE_OR 1
-/** OR-side circuit purpose: At OR, from Bob, waiting for intro from Alices. */
+/** OR-side circuit purpose: At OR, from the service, waiting for intro from
+ * clients. */
 #define CIRCUIT_PURPOSE_INTRO_POINT 2
-/** OR-side circuit purpose: At OR, from Alice, waiting for Bob. */
+/** OR-side circuit purpose: At OR, from the client, waiting for the service.
+ */
 #define CIRCUIT_PURPOSE_REND_POINT_WAITING 3
 /** OR-side circuit purpose: At OR, both circuits have this purpose. */
 #define CIRCUIT_PURPOSE_REND_ESTABLISHED 4
@@ -479,43 +481,47 @@ typedef enum {
  * to becoming open, or they are open and have sent the
  * establish_rendezvous cell but haven't received an ack.
  *   circuits that are c_rend_ready are open and have received a
- * rend ack, but haven't heard from bob yet. if they have a
+ * rend ack, but haven't heard from the service yet. if they have a
  * buildstate->pending_final_cpath then they're expecting a
- * cell from bob, else they're not.
+ * cell from the service, else they're not.
  *   circuits that are c_rend_ready_intro_acked are open, and
  *

[tor-commits] [tor/master] Correct grammatical errors in tor log messages

2016-01-26 Thread nickm 
commit 7a4b4f0c3a08f08a5a7774b27811f0c5af3c1e99
Author: teor (Tim Wilson-Brown) 
Date:   Tue Jan 26 13:47:23 2016 +1100

Correct grammatical errors in tor log messages

Avoid using gender for things that don't have it.
---
 src/or/router.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/router.c b/src/or/router.c
index 8cde4a1..741e1ed 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2375,7 +2375,7 @@ router_new_address_suggestion(const char *suggestion,
   if (tor_addr_eq(_conn->base_.addr, )) {
 /* Don't believe anybody who says our IP is their IP. */
 log_debug(LD_DIR, "A directory server told us our IP address is %s, "
-  "but he's just reporting his own IP address. Ignoring.",
+  "but they are just reporting their own IP address. Ignoring.",
   suggestion);
 return;
   }



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

[tor-commits] [torspec/master] Clients may bootstrap from a default fallback directory mirror

2016-01-26 Thread nickm 
commit 8ae8544ada81ce9d0e1c0216440e0b7daf8d2ded
Author: teor (Tim Wilson-Brown) 
Date:   Mon Jan 25 10:49:34 2016 +1100

Clients may bootstrap from a default fallback directory mirror

Update the directory spec to describe client behaviour with default
fallback directory mirrors after #15775 and #4483.
---
 dir-spec.txt |   20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index 66b3421..a61f02c 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -2941,15 +2941,22 @@
Each client maintains a list of directory authorities.  Insofar as
possible, clients SHOULD all use the same list.
 
+  [Newer versions of Tor (0.2.8.1-alpha and later):
+   Each client also maintains a list of default fallback directory mirrors
+   (fallbacks). Each released version of Tor MAY have a different list,
+   depending on the mirrors that satisfy the fallback directory criteria at
+   release time.]
+
Clients try to have a live consensus network-status document at all times.
A network-status document is "live" if the time in its valid-until field
has not passed.
 
When a client has no consensus network-status document, it downloads it
-   from a randomly chosen authority.  In all other cases, the client
-   downloads from caches randomly chosen from among those believed to be V3
-   directory servers.  (This information comes from the network-status
-   documents; see 6 below.)
+   from a randomly chosen fallback directory mirror or authority. Clients
+   prefer fallbacks to authorities, trying them earlier and more frequently.
+   In all other cases, the client downloads from caches randomly chosen from
+   among those believed to be V3 directory servers.  (This information comes
+   from the network-status documents; see 6 below.)
 
After receiving any response client MUST discard any network-status
documents that it did not request.
@@ -2977,8 +2984,9 @@
 
(Note: clients can and should pick caches based on the network-status
information they have: once they have first fetched network-status info
-   from an authority, they should not need to go to the authority directly
-   again.)
+   from an authority or fallback, they should not need to go to the authority
+   directly again, and should only choose the fallback at random, based on its
+   consensus weight in the current consensus.)
 
To avoid swarming the caches whenever a consensus expires, the
clients download new consensuses at a randomly chosen time after the



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

[tor-commits] [torspec/master] Fix a typo in the directory spec where cache was used instead of client

2016-01-26 Thread nickm 
commit 3181c504713c2e7c64b2b4b0bf2c966c7d296d1a
Author: teor (Tim Wilson-Brown) 
Date:   Mon Jan 25 10:51:05 2016 +1100

Fix a typo in the directory spec where cache was used instead of client
---
 dir-spec.txt |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index a61f02c..2ab1878 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -2996,8 +2996,8 @@
consensus is no longer fresh, and 7/8 of the time remaining after
that before the consensus is invalid.)
 
-   [For example, if a cache has a consensus that became valid at 1:00,
-and is fresh until 2:00, and expires at 4:00, that cache will fetch
+   [For example, if a client has a consensus that became valid at 1:00,
+and is fresh until 2:00, and expires at 4:00, that client will fetch
 a new consensus at a random time between 2:45 and 3:50, since 3/4
 of the one-hour interval is 45 minutes, and 7/8 of the remaining 75
 minutes is 65 minutes.]

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

[tor-commits] [metrics-web/master] Remove one country code, add four.

2016-01-26 Thread karsten 
commit 3d7480ea94b5d4fe7b0cfd47821d1029d9fd8265
Author: Karsten Loesing 
Date:   Tue Jan 26 17:41:12 2016 +0100

Remove one country code, add four.

 - Remove FX (France, Metropolitan): Wikipedia says this country code
   was reserved on request of France, but it's neither used by MaxMind
   nor by little-t-tor.  We can safely drop this country code from
   Metrics.
 - Add BQ (Bonaire, Sint Eustatius and Saba): This country code was
   assigned in 2010, and Metrics is missing it.  We should add it.
 - Add CW (Curacao): See BQ, add it.
 - Add SX (Sint Maarten): See BQ, add it.
 - Add XK (Kosovo): Wikipedia says that XF is a user-assigned code
   that is being used by the European Commission, Switzerland, the
   Deutsche Bundesbank, SWIFT, and other organizations as a temporary
   country code for Kosovo.  MaxMind adds this country code in its
   GeoIP2 format, and there are actual Tor users from that country
   code.  We should add it to Metrics, too.

Fixes #17786.
---
 modules/clients/country_info.py  |5 -
 website/rserve/graphs.R  |5 -
 website/src/org/torproject/metrics/web/graphs/Countries.java |6 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/clients/country_info.py b/modules/clients/country_info.py
index e23728e..1a505d0 100644
--- a/modules/clients/country_info.py
+++ b/modules/clients/country_info.py
@@ -31,6 +31,7 @@ countries = {
 "bm" : "Bermuda",
 "bn" : "Brunei",
 "bo" : "Bolivia",
+"bq" : "Bonaire, Sint Eustatius and Saba",
 "br" : "Brazil",
 "bs" : "the Bahamas",
 "bt" : "Bhutan",
@@ -53,6 +54,7 @@ countries = {
 "cr" : "Costa Rica",
 "cu" : "Cuba",
 "cv" : "Cape Verde",
+"cw" : u"Curaçao",
 "cx" : "the Christmas Island",
 "cy" : "Cyprus",
 "cz" : "the Czech Republic",
@@ -75,7 +77,6 @@ countries = {
 "fm" : "the Federated States of Micronesia",
 "fo" : "the Faroe Islands",
 "fr" : "France",
-"fx" : "Metropolitan France",
 "ga" : "Gabon",
 "gb" : "the United Kingdom",
 "gd" : "Grenada",
@@ -211,6 +212,7 @@ countries = {
 "ss" : "South Sudan",
 "st" : u"São Tomé and Príncipe",
 "sv" : "El Salvador",
+"sx" : "Sint Maarten",
 "sy" : "the Syrian Arab Republic",
 "sz" : "Swaziland",
 "tc" : "Turks and Caicos Islands",
@@ -244,6 +246,7 @@ countries = {
 "vu" : "Vanuatu",
 "wf" : "Wallis and Futuna",
 "ws" : "Samoa",
+"xk" : "Kosovo",
 "ye" : "Yemen",
 "yt" : "Mayotte",
 "za" : "South Africa",
diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R
index bbb2561..87ac39a 100644
--- a/website/rserve/graphs.R
+++ b/website/rserve/graphs.R
@@ -29,6 +29,7 @@ countrylist <- list(
   "bm" = "Bermuda",
   "bn" = "Brunei",
   "bo" = "Bolivia",
+  "bq" = "Bonaire, Sint Eustatius and Saba",
   "br" = "Brazil",
   "bs" = "the Bahamas",
   "bt" = "Bhutan",
@@ -51,6 +52,7 @@ countrylist <- list(
   "cr" = "Costa Rica",
   "cu" = "Cuba",
   "cv" = "Cape Verde",
+  "cw" = "Curaçao",
   "cx" = "the Christmas Island",
   "cy" = "Cyprus",
   "cz" = "the Czech Republic",
@@ -73,7 +75,6 @@ countrylist <- list(
   "fm" = "the Federated States of Micronesia",
   "fo" = "the Faroe Islands",
   "fr" = "France",
-  "fx" = "Metropolitan France",
   "ga" = "Gabon",
   "gb" = "the United Kingdom",
   "gd" = "Grenada",
@@ -209,6 +210,7 @@ countrylist <- list(
   "ss" = "South Sudan",
   "st" = "São Tomé and Príncipe",
   "sv" = "El Salvador",
+  "sx" = "Sint Maarten",
   "sy" = "the Syrian Arab Republic",
   "sz" = "Swaziland",
   "tc" = "Turks and Caicos Islands",
@@ -242,6 +244,7 @@ countrylist <- list(
   "vu" = "Vanuatu",
   "wf" = "Wallis and Futuna",
   "ws" = "Samoa",
+  "xk" = "Kosovo",
   "ye" = "Yemen",
   "yt" = "Mayotte",
   "za" = "South Africa",
diff --git a/website/src/org/torproject/metrics/web/graphs/Countries.java 
b/website/src/org/torproject/metrics/web/graphs/Countries.java
index 7a99a46..7982a8f 100644
--- a/website/src/org/torproject/metrics/web/graphs/Countries.java
+++ b/website/src/org/torproject/metrics/web/graphs/Countries.java
@@ -46,6 +46,8 @@ public class Countries {
 this.knownCountries.add("bm;Bermuda".split(";"));
 this.knownCountries.add("bt;Bhutan".split(";"));
 this.knownCountries.add("bo;Bolivia".split(";"));
+this.knownCountries.add("bq;Bonaire, Sint Eustatius and Saba".
+split(";"));
 this.knownCountries.add("ba;Bosnia and Herzegovina".split(";"));
 this.knownCountries.add("bw;Botswana".split(";"));
 this.knownCountries.add("bv;Bouvet Island".split(";"));
@@ -78,6 +80,7 @@ public class Countries {
 this.knownCountries.add("ci:Cte d'Ivoire".split(":"));
 this.knownCountries.add("hr;Croatia".split(";"));
 this.knownCountries.add("cu;Cuba".split(";"));
+

[tor-commits] [metrics-web/master] squash! Remove one country code, add four.

2016-01-26 Thread karsten 
commit 1fea9125e1fa38b25254c27dd75719dc96bff376
Author: Karsten Loesing 
Date:   Tue Jan 26 17:51:34 2016 +0100

squash! Remove one country code, add four.

Fix trivial bug in displaying Curacao on the website.
---
 website/src/org/torproject/metrics/web/graphs/Countries.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/src/org/torproject/metrics/web/graphs/Countries.java 
b/website/src/org/torproject/metrics/web/graphs/Countries.java
index 7982a8f..574fd0c 100644
--- a/website/src/org/torproject/metrics/web/graphs/Countries.java
+++ b/website/src/org/torproject/metrics/web/graphs/Countries.java
@@ -80,7 +80,7 @@ public class Countries {
 this.knownCountries.add("ci:Cte d'Ivoire".split(":"));
 this.knownCountries.add("hr;Croatia".split(";"));
 this.knownCountries.add("cu;Cuba".split(";"));
-this.knownCountries.add("cw;Curaao".split(";"));
+this.knownCountries.add("cw:Curaao".split(":"));
 this.knownCountries.add("cy;Cyprus".split(";"));
 this.knownCountries.add("cz;Czech Republic".split(";"));
 this.knownCountries.add("dk;Denmark".split(";"));

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

[tor-commits] [stem/master] Correct ipv6 little-endian conversion

2016-01-26 Thread atagar 
commit 88ecc4270799d65a64ec8d52be16297ec932b705
Author: Damian Johnson 
Date:   Tue Jan 26 09:07:48 2016 -0800

Correct ipv6 little-endian conversion

Fixing how we convert little-endian ipv6 addresses, thanks to yawning and
cypherpunks...

  https://trac.torproject.org/projects/tor/ticket/18079#comment:24
---
 stem/util/proc.py  |   31 ---
 test/unit/util/proc.py |   12 +++-
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/stem/util/proc.py b/stem/util/proc.py
index d519e6f..2b16ccb 100644
--- a/stem/util/proc.py
+++ b/stem/util/proc.py
@@ -431,8 +431,10 @@ def _decode_proc_address_encoding(addr, is_ipv6):
   ::
 
 "050A:0016" -> ("10.0.0.5", 22)
+"F804012A4A5190010200:01BB" -> ("2a01:4f8:190:514a::2", 443)
 
   :param str addr: proc address entry to be decoded
+  :param bool is_ipv6: if we should treat the address as ipv6
 
   :returns: **tuple** of the form **(addr, port)**, with addr as a string and 
port an int
   """
@@ -441,17 +443,24 @@ def _decode_proc_address_encoding(addr, is_ipv6):
 
   port = int(port, 16)  # the port is represented as a two-byte hexadecimal 
number
 
-  # The IP address portion is a little-endian four-byte hexadecimal number.
-  # That is, the least significant byte is listed first, so we need to reverse
-  # the order of the bytes to convert it to an IP address.
-  #
-  # This needs to account for the endian ordering as per...
-  #
-  # http://code.google.com/p/psutil/issues/detail?id=201
-  # https://trac.torproject.org/projects/tor/ticket/4777
-
-  ip_encoded = base64.b16decode(ip)[::-1] if sys.byteorder == 'little' else 
base64.b16decode(ip)
-  ip = socket.inet_ntop(socket.AF_INET6 if is_ipv6 else socket.AF_INET, 
ip_encoded)
+  if not is_ipv6:
+ip_encoded = base64.b16decode(ip)[::-1] if sys.byteorder == 'little' else 
base64.b16decode(ip)
+ip = socket.inet_ntop(socket.AF_INET, ip_encoded)
+  else:
+if sys.byteorder == 'little':
+  # Group into eight characters, then invert in pairs...
+  #
+  #   https://trac.torproject.org/projects/tor/ticket/18079#comment:24
+
+  inverted = []
+
+  for i in range(4):
+grouping = ip[8 * i:8 * (i + 1)]
+inverted += [grouping[2 * i:2 * (i + 1)] for i in range(4)][::-1]
+
+  ip = ''.join(inverted)
+
+ip = socket.inet_ntop(socket.AF_INET6, base64.b16decode(ip))
 
   return (ip, port)
 
diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py
index 4b7d37f..f852820 100644
--- a/test/unit/util/proc.py
+++ b/test/unit/util/proc.py
@@ -247,16 +247,12 @@ class TestProc(unittest.TestCase):
 pid = 
 
 listdir_mock.side_effect = lambda param: {
-  '/proc/%s/fd' % pid: ['1', '2', '3', '4'],
+  '/proc/%s/fd' % pid: ['1', '2'],
 }[param]
 
 readlink_mock.side_effect = lambda param: {
   '/proc/%s/fd/1' % pid: 'socket:[42088802]',
   '/proc/%s/fd/2' % pid: 'socket:[41691357]',
-  '/proc/%s/fd/3' % pid: 'socket:[41878761]',
-  '/proc/%s/fd/4' % pid: 'socket:[41825895]',
-  '/proc/%s/fd/5' % pid: 'socket:[41512577]',
-  '/proc/%s/fd/6' % pid: 'socket:[14347030]',  # this shouldn't be present 
due to being unestablished
 }[param]
 
 path_exists_mock.side_effect = lambda param: {
@@ -271,10 +267,8 @@ class TestProc(unittest.TestCase):
 }[param]
 
 expected_results = [
-  ('0:2::190:514a:2a01:4f8', 443, ':189::a000:4140:2001:638', 40435, 
'tcp', True),
-  ('0:2::190:514a:2a01:4f8', 443, '563b:1526:aabb:0:2:2:2001:858', 44469, 
'tcp', True),
-  ('509:9e4b:0:::', 5222, '4e36:8621:0:::', 38330, 'tcp', True),
-  ('0:2::190:514a:2a01:4f8', 5269, '0:26::126f:11:2001:6f8', 50594, 'tcp', 
True),
+  ('2a01:4f8:190:514a::2', 443, '2001:638:a000:4140:::189', 40435, 
'tcp', True),
+  ('2a01:4f8:190:514a::2', 443, '2001:858:2:2:aabb:0:563b:1526', 44469, 
'tcp', True),
 ]
 
 self.assertEqual(expected_results, proc.connections(pid))

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

[tor-commits] [stem/master] Proc connections skipped due to incorrect file mode

2016-01-26 Thread atagar 
commit e04f453314f015ef994f798d1418670f62003386
Author: Damian Johnson 
Date:   Tue Jan 26 09:36:52 2016 -0800

Proc connections skipped due to incorrect file mode

toralf reports that proc connection resolution no longer works and think I 
see
the issue. Under python3 we read the contents as unicode but our checks all
expect bytes, causing us to skip all the lines.
---
 stem/util/proc.py  |4 ++--
 test/unit/util/proc.py |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/stem/util/proc.py b/stem/util/proc.py
index 2b16ccb..7fdd70f 100644
--- a/stem/util/proc.py
+++ b/stem/util/proc.py
@@ -393,7 +393,7 @@ def connections(pid):
   continue
 
 try:
-  with open(proc_file_path) as proc_file:
+  with open(proc_file_path, 'rb') as proc_file:
 proc_file.readline()  # skip the first line
 
 for line in proc_file:
@@ -458,7 +458,7 @@ def _decode_proc_address_encoding(addr, is_ipv6):
 grouping = ip[8 * i:8 * (i + 1)]
 inverted += [grouping[2 * i:2 * (i + 1)] for i in range(4)][::-1]
 
-  ip = ''.join(inverted)
+  ip = b''.join(inverted)
 
 ip = socket.inet_ntop(socket.AF_INET6, base64.b16decode(ip))
 
diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py
index f852820..ee52d21 100644
--- a/test/unit/util/proc.py
+++ b/test/unit/util/proc.py
@@ -220,7 +220,7 @@ class TestProc(unittest.TestCase):
   '/proc/net/udp6': False
 }[param]
 
-open_mock.side_effect = lambda param: {
+open_mock.side_effect = lambda param, mode: {
   '/proc/net/tcp': io.BytesIO(tcp),
   '/proc/net/udp': io.BytesIO(udp)
 }[param]
@@ -262,7 +262,7 @@ class TestProc(unittest.TestCase):
   '/proc/net/udp6': False
 }[param]
 
-open_mock.side_effect = lambda param: {
+open_mock.side_effect = lambda param, mode: {
   '/proc/net/tcp6': io.BytesIO(TCP6_CONTENT),
 }[param]
 

___
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-01-26 Thread translation 
commit 40c7532e3b305ed16479dfbdbf8bc788966d2036
Author: Translation commit bot 
Date:   Tue Jan 26 17:45:04 2016 +

Update translations for bridgedb
---
 hy_AM/LC_MESSAGES/bridgedb.po |  340 +
 1 file changed, 171 insertions(+), 169 deletions(-)

diff --git a/hy_AM/LC_MESSAGES/bridgedb.po b/hy_AM/LC_MESSAGES/bridgedb.po
index a16d2ea..3145ed9 100644
--- a/hy_AM/LC_MESSAGES/bridgedb.po
+++ b/hy_AM/LC_MESSAGES/bridgedb.po
@@ -4,17 +4,19 @@
 # 
 # Translators:
 # mhrach87 , 2014
+# Sergei , 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'POT-Creation-Date:
 2015-03-19 22:13+\n"
-"PO-Revision-Date: 2015-04-19 08:23+\n"
-"Last-Translator: runasand \n"
-"Language-Team: Armenian (Armenia) 
(http://www.transifex.com/projects/p/torproject/language/hy_AM/)\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-01-26 17:45+\n"
+"Last-Translator: Sergei \n"
+"Language-Team: Armenian (Armenia) 
(http://www.transifex.com/otf/torproject/language/hy_AM/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: hy_AM\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -29,57 +31,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Քայլ %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Ներբեռնել %s Tor Browser %s-ը"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Քայլ %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Քայլ %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ոչ"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Õ¸Õ¹Õ«Õ¶Õ¹"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#:

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

2016-01-26 Thread translation 
commit 546412ff0db3c370568e4a1a6bc394c3f5222600
Author: Translation commit bot 
Date:   Tue Jan 26 18:15:03 2016 +

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

diff --git a/hy_AM/LC_MESSAGES/bridgedb.po b/hy_AM/LC_MESSAGES/bridgedb.po
index 3145ed9..ec851b6 100644
--- a/hy_AM/LC_MESSAGES/bridgedb.po
+++ b/hy_AM/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,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-01-26 17:45+\n"
+"PO-Revision-Date: 2016-01-26 17:47+\n"
 "Last-Translator: Sergei \n"
 "Language-Team: Armenian (Armenia) 
(http://www.transifex.com/otf/torproject/language/hy_AM/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr ""
+msgstr "Հայտնել սխալի մասին"
 
 #: 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/bridgedb] Update translations for bridgedb

2016-01-26 Thread translation 
commit b269a42db2720332276d83e66f54a52fe3d94a7d
Author: Translation commit bot 
Date:   Tue Jan 26 19:15:03 2016 +

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

diff --git a/hy_AM/LC_MESSAGES/bridgedb.po b/hy_AM/LC_MESSAGES/bridgedb.po
index ec851b6..b76d811 100644
--- a/hy_AM/LC_MESSAGES/bridgedb.po
+++ b/hy_AM/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,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-01-26 17:47+\n"
+"PO-Revision-Date: 2016-01-26 19:12+\n"
 "Last-Translator: Sergei \n"
 "Language-Team: Armenian (Armenia) 
(http://www.transifex.com/otf/torproject/language/hy_AM/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 #. "Tor Browser"
 #: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr ""
+msgstr "Կներեք։ Ձեր հայտի հետ խնդիր առաջացավ։"
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
@@ -49,15 +49,15 @@ msgstr ""
 
 #: bridgedb/https/templates/base.html:88
 msgid "Contact"
-msgstr ""
+msgstr "Կապորդներ"
 
 #: bridgedb/https/templates/bridges.html:35
 msgid "Select All"
-msgstr ""
+msgstr "Ընտրել բոլորը"
 
 #: bridgedb/https/templates/bridges.html:40
 msgid "Show QRCode"
-msgstr ""
+msgstr "Ցույց տալ QR ծածկագիրը"
 
 #: bridgedb/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"

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

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

2016-01-26 Thread translation 
commit 685f2f0aeb5245c3264b2301f6c47d10cf2fa9a5
Author: Translation commit bot 
Date:   Tue Jan 26 20:15:30 2016 +

Update translations for mat-gui
---
 nn.po |  129 +
 1 file changed, 65 insertions(+), 64 deletions(-)

diff --git a/nn.po b/nn.po
index 5cc485a..7baae1c 100644
--- a/nn.po
+++ b/nn.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Bjørn I. , 2014
+# Øystein Alværvik , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 15:03+0100\n"
-"PO-Revision-Date: 2015-12-17 09:29+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2016-01-03 20:54+0100\n"
+"PO-Revision-Date: 2016-01-26 19:46+\n"
+"Last-Translator: Øystein Alværvik \n"
 "Language-Team: Norwegian Nynorsk 
(http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,171 +19,171 @@ msgstr ""
 "Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mat-gui:64 mat-gui:415 mat-gui:438
+#: mat-gui:66 mat-gui:422 mat-gui:445
 msgid "Ready"
 msgstr "Klar"
 
-#: mat-gui:133
+#: mat-gui:136
 msgid "Choose files"
 msgstr "Vel filer"
 
-#: mat-gui:141
-msgid "All files"
-msgstr "Alle filer"
-
-#: mat-gui:147
+#: mat-gui:144
 msgid "Supported files"
 msgstr "Støtta filer"
 
-#: mat-gui:164 mat-gui:359 mat-gui:410 mat-gui:434 mat-gui:436
-#: data/mat.glade:480
+#: mat-gui:151
+msgid "All files"
+msgstr "Alle filer"
+
+#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443
+#: data/mat.glade:200
 msgid "Clean"
 msgstr "Rein"
 
-#: mat-gui:165
+#: mat-gui:168
 msgid "No metadata found"
 msgstr "Ingen metadata funne"
 
-#: mat-gui:167 mat-gui:412
+#: mat-gui:170 mat-gui:419
 msgid "Dirty"
 msgstr "Ikkje rein"
 
-#: mat-gui:172
+#: mat-gui:176
 #, python-format
 msgid "%s's metadata"
 msgstr "%s metadata"
 
-#: mat-gui:183
+#: mat-gui:187
 msgid "Trash your meta, keep your data"
 msgstr "Kast meta, behald dine data"
 
-#: mat-gui:188
+#: mat-gui:192
 msgid "Website"
 msgstr "Vevside"
 
-#: mat-gui:214
+#: mat-gui:219
 msgid "Preferences"
 msgstr "Innstillingar"
 
-#: mat-gui:227
+#: mat-gui:232
 msgid "Reduce PDF quality"
 msgstr "Reduser PDF-kvalitet"
 
-#: mat-gui:230
+#: mat-gui:235
 msgid "Reduce the produced PDF size and quality"
 msgstr "Reduser storleik til produsert PDF og kvalitet"
 
-#: mat-gui:233
+#: mat-gui:238
 msgid "Add unsupported file to archives"
 msgstr "Legg til ustøtta filer i arkiva"
 
-#: mat-gui:236
+#: mat-gui:241
 msgid "Add non-supported (and so non-anonymised) file to output archive"
 msgstr "Legg til ikkje-støtta (og med det ikkje-anonymiserte) filer i 
utdata-arkivet"
 
-#: mat-gui:275
+#: mat-gui:280
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: mat-gui:318
+#: mat-gui:325
 msgid "Not-supported"
 msgstr "Ikkje-støtta"
 
-#: mat-gui:332
+#: mat-gui:339
 msgid "Harmless fileformat"
 msgstr "Harmlaust filformat"
 
-#: mat-gui:334
+#: mat-gui:341
 msgid "Cant read file"
-msgstr ""
+msgstr "Kan ikkje lese fila."
 
-#: mat-gui:336
+#: mat-gui:343
 msgid "Fileformat not supported"
 msgstr "Filformat ikkje støtta"
 
-#: mat-gui:339
+#: mat-gui:346
 msgid "These files can not be processed:"
 msgstr "Desse filene kan ikkje handsamast:"
 
-#: mat-gui:344 mat-gui:373 data/mat.glade:519
+#: mat-gui:351 mat-gui:380 data/mat.glade:239
 msgid "Filename"
 msgstr "Filnamn"
 
-#: mat-gui:346
+#: mat-gui:353
 msgid "Reason"
 msgstr "Årsak"
 
-#: mat-gui:358
+#: mat-gui:365
 msgid "Non-supported files in archive"
 msgstr "Ikkje-støtta filer i arkivet"
 
-#: mat-gui:372
+#: mat-gui:379
 msgid "Include"
 msgstr "Inkluder"
 
-#: mat-gui:390
+#: mat-gui:397
 #, python-format
 msgid "MAT is not able to clean the following files, found in the %s archive"
 msgstr "MAT kan ikkje rydde opp i følgjande filer funne i %s-arkivet"
 
-#: mat-gui:406
+#: mat-gui:413
 #, python-format
 msgid "Checking %s"
 msgstr "Kontrollerer %s"
 
-#: mat-gui:421
+#: mat-gui:428
 #, python-format
 msgid "Cleaning %s"
 msgstr "Ryddar opp %s"
 
-#: data/mat.glade:26 data/mat.glade:196
+#: data/mat.glade:46
+msgid "_File"
+msgstr "_Arkiv"
+
+#: data/mat.glade:95
+msgid "_Edit"
+msgstr "_Rediger"
+
+#: data/mat.glade:141
+msgid "_Help"
+msgstr "_Hjelp"
+
+#: data/mat.glade:187
+msgid "Add"
+msgstr "Legg til"
+
+#: data/mat.glade:256
+msgid "State"
+msgstr "Tilstand"
+
+#: data/mat.glade:294 data/mat.glade:467
 msgid "Metadata"
 msgstr "Metadata"
 
-#: data/mat.glade:85
+#: data/mat.glade:354
 msgid "Name"
 msgstr "Namn"
 
-#: data/mat.glade:99
+#: data/mat.glade:368
 msgid "Content"
 msgstr "Innhald"
 
-#: data/mat.glade:129
+#: data/mat.glade:398
 msgid "Supported formats"
 msgstr "Støtta format"
 
-#: data/mat.glade:185
+#: data/mat.glade:456
 msgid "Support"
 msgstr "Støtte"
 
-#: data/mat.glade:207

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

2016-01-26 Thread translation 
commit 01dbda47ee5e586486b0c5a7b50832638da98d60
Author: Translation commit bot 
Date:   Tue Jan 26 20:15:44 2016 +

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

diff --git a/nn/network-settings.dtd b/nn/network-settings.dtd
index 4bd82f0..c2b7372 100644
--- a/nn/network-settings.dtd
+++ b/nn/network-settings.dtd
@@ -2,16 +2,16 @@
 
 
 
-
+
 
 
 
-
+
 
 
 
 
-
+
 
 
 

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

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

2016-01-26 Thread translation 
commit d5798de3b0f79351483715d503d3857d9d49e72a
Author: Translation commit bot 
Date:   Tue Jan 26 20:15:35 2016 +

Update translations for mat-gui_completed
---
 nn.po |  101 ++---
 1 file changed, 53 insertions(+), 48 deletions(-)

diff --git a/nn.po b/nn.po
index 47ad1f3..7baae1c 100644
--- a/nn.po
+++ b/nn.po
@@ -4,181 +4,186 @@
 # 
 # Translators:
 # Bjørn I. , 2014
+# Øystein Alværvik , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-31 04:53+0100\n"
-"PO-Revision-Date: 2015-02-23 08:18+\n"
-"Last-Translator: runasand \n"
-"Language-Team: Norwegian Nynorsk 
(http://www.transifex.com/projects/p/torproject/language/nn/)\n"
+"POT-Creation-Date: 2016-01-03 20:54+0100\n"
+"PO-Revision-Date: 2016-01-26 19:46+\n"
+"Last-Translator: Øystein Alværvik \n"
+"Language-Team: Norwegian Nynorsk 
(http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mat-gui:62 mat-gui:407 mat-gui:430
+#: mat-gui:66 mat-gui:422 mat-gui:445
 msgid "Ready"
 msgstr "Klar"
 
-#: mat-gui:129
+#: mat-gui:136
 msgid "Choose files"
 msgstr "Vel filer"
 
-#: mat-gui:137
-msgid "All files"
-msgstr "Alle filer"
-
-#: mat-gui:143
+#: mat-gui:144
 msgid "Supported files"
 msgstr "Støtta filer"
 
-#: mat-gui:160 mat-gui:353 mat-gui:402 mat-gui:426 mat-gui:428
-#: data/mat.glade:172
+#: mat-gui:151
+msgid "All files"
+msgstr "Alle filer"
+
+#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443
+#: data/mat.glade:200
 msgid "Clean"
 msgstr "Rein"
 
-#: mat-gui:161
+#: mat-gui:168
 msgid "No metadata found"
 msgstr "Ingen metadata funne"
 
-#: mat-gui:163 mat-gui:404
+#: mat-gui:170 mat-gui:419
 msgid "Dirty"
 msgstr "Ikkje rein"
 
-#: mat-gui:168
+#: mat-gui:176
 #, python-format
 msgid "%s's metadata"
 msgstr "%s metadata"
 
-#: mat-gui:179
+#: mat-gui:187
 msgid "Trash your meta, keep your data"
 msgstr "Kast meta, behald dine data"
 
-#: mat-gui:184
+#: mat-gui:192
 msgid "Website"
 msgstr "Vevside"
 
-#: mat-gui:210
+#: mat-gui:219
 msgid "Preferences"
 msgstr "Innstillingar"
 
-#: mat-gui:223
+#: mat-gui:232
 msgid "Reduce PDF quality"
 msgstr "Reduser PDF-kvalitet"
 
-#: mat-gui:226
+#: mat-gui:235
 msgid "Reduce the produced PDF size and quality"
 msgstr "Reduser storleik til produsert PDF og kvalitet"
 
-#: mat-gui:229
+#: mat-gui:238
 msgid "Add unsupported file to archives"
 msgstr "Legg til ustøtta filer i arkiva"
 
-#: mat-gui:232
+#: mat-gui:241
 msgid "Add non-supported (and so non-anonymised) file to output archive"
 msgstr "Legg til ikkje-støtta (og med det ikkje-anonymiserte) filer i 
utdata-arkivet"
 
-#: mat-gui:271
+#: mat-gui:280
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: mat-gui:314
+#: mat-gui:325
 msgid "Not-supported"
 msgstr "Ikkje-støtta"
 
-#: mat-gui:328
+#: mat-gui:339
 msgid "Harmless fileformat"
 msgstr "Harmlaust filformat"
 
-#: mat-gui:330
+#: mat-gui:341
+msgid "Cant read file"
+msgstr "Kan ikkje lese fila."
+
+#: mat-gui:343
 msgid "Fileformat not supported"
 msgstr "Filformat ikkje støtta"
 
-#: mat-gui:333
+#: mat-gui:346
 msgid "These files can not be processed:"
 msgstr "Desse filene kan ikkje handsamast:"
 
-#: mat-gui:338 mat-gui:367 data/mat.glade:211
+#: mat-gui:351 mat-gui:380 data/mat.glade:239
 msgid "Filename"
 msgstr "Filnamn"
 
-#: mat-gui:340
+#: mat-gui:353
 msgid "Reason"
 msgstr "Årsak"
 
-#: mat-gui:352
+#: mat-gui:365
 msgid "Non-supported files in archive"
 msgstr "Ikkje-støtta filer i arkivet"
 
-#: mat-gui:366
+#: mat-gui:379
 msgid "Include"
 msgstr "Inkluder"
 
-#: mat-gui:382
+#: mat-gui:397
 #, python-format
 msgid "MAT is not able to clean the following files, found in the %s archive"
 msgstr "MAT kan ikkje rydde opp i følgjande filer funne i %s-arkivet"
 
-#: mat-gui:398
+#: mat-gui:413
 #, python-format
 msgid "Checking %s"
 msgstr "Kontrollerer %s"
 
-#: mat-gui:413
+#: mat-gui:428
 #, python-format
 msgid "Cleaning %s"
 msgstr "Ryddar opp %s"
 
-#: data/mat.glade:33
+#: data/mat.glade:46
 msgid "_File"
 msgstr "_Arkiv"
 
-#: data/mat.glade:82
+#: data/mat.glade:95
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: data/mat.glade:115
+#: data/mat.glade:141
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: data/mat.glade:159
+#: data/mat.glade:187
 msgid "Add"
 msgstr "Legg til"
 
-#: data/mat.glade:228
+#: data/mat.glade:256
 msgid "State"
 msgstr "Tilstand"
 
-#: data/mat.glade:274 data/mat.glade:417
+#: data/mat.glade:294 data/mat.glade:467
 msgid "Metadata"
 msgstr "Metadata"
 
-#: data/mat.glade:306
+#: data/mat.glade:354
 msgid "Name"
 msgstr "Namn"
 
-#: data/mat.glade:320
+#: data/mat.glade:368
 msgid "Content"
 msgstr

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

2016-01-26 Thread translation 
commit 6c0fa21dbaaa8b298f524e47aaa6aac6a207dd38
Author: Translation commit bot 
Date:   Tue Jan 26 20:45:47 2016 +

Update translations for tor-launcher-network-settings
---
 nl/network-settings.dtd |2 +-
 nn/network-settings.dtd |   28 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/nl/network-settings.dtd b/nl/network-settings.dtd
index af1ea16..488f358 100644
--- a/nl/network-settings.dtd
+++ b/nl/network-settings.dtd
@@ -38,7 +38,7 @@
 
 
 
-
+
 
 
 
diff --git a/nn/network-settings.dtd b/nn/network-settings.dtd
index c2b7372..9023565 100644
--- a/nn/network-settings.dtd
+++ b/nn/network-settings.dtd
@@ -12,30 +12,30 @@
 
 
 
-
-
-
-
-
+
+
+
+
+
 
 
-
-
+
+
 
 
 
 
 
-
-
-
-
+
+
+
+
 
 
 
-
+
 
-
+
 
 
 
@@ -67,7 +67,7 @@
 
 
 
-https://bridges.torproject.org;>
+https://bridges.torproject.org;>
 
 
 https://www.riseup.net, 
https://mail.google.com, or 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/abouttor-homepage] Update translations for abouttor-homepage

2016-01-26 Thread translation 
commit 3bb00f984b2232b9253df28b1a91d0b54950f97f
Author: Translation commit bot 
Date:   Tue Jan 26 20:45:56 2016 +

Update translations for abouttor-homepage
---
 nn/aboutTor.dtd |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/nn/aboutTor.dtd b/nn/aboutTor.dtd
index fce98e7..b9c9707 100644
--- a/nn/aboutTor.dtd
+++ b/nn/aboutTor.dtd
@@ -6,19 +6,19 @@
 
 
 
-
+
 
-
+
 
-
+
 
-
-
+
+
 
 
 
-
-
+
+
 
 
 
@@ -29,9 +29,9 @@
 
 
 
-
-
-
+
+
+
 
 
 https://www.torproject.org/download/download.html.en#warning;>

___
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-01-26 Thread translation 
commit ed064a10535f5651372058206bc2328271603cee
Author: Translation commit bot 
Date:   Tue Jan 26 21:16:00 2016 +

Update translations for abouttor-homepage
---
 nn/aboutTor.dtd |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nn/aboutTor.dtd b/nn/aboutTor.dtd
index b9c9707..274905b 100644
--- a/nn/aboutTor.dtd
+++ b/nn/aboutTor.dtd
@@ -32,12 +32,12 @@
 
 
 
-
-
+
+
 https://www.torproject.org/download/download.html.en#warning;>
 
-
-
+
+
 https://www.torproject.org/docs/tor-doc-relay.html.en;>
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>

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

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

2016-01-26 Thread translation 
commit bccbc57c37c6d1b6d76675616a0b49752d60ac5a
Author: Translation commit bot 
Date:   Tue Jan 26 21:15:42 2016 +

Update translations for tor-launcher-properties
---
 nn/torlauncher.properties |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nn/torlauncher.properties b/nn/torlauncher.properties
index 062fb5c..8e3c85d 100644
--- a/nn/torlauncher.properties
+++ b/nn/torlauncher.properties
@@ -1,17 +1,17 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
-torlauncher.error_title=Tor Launcher
+torlauncher.error_title=Tor-oppstartar
 
 torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in 
Tor itself, another program on your system, or faulty hardware. Until you 
restart Tor, the Tor Browser will not able to reach any websites. If the 
problem persists, please send a copy of your Tor Log to the support team.
 torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
-torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-torlauncher.tor_failed_to_start=Tor failed to start.
+torlauncher.tor_controlconn_failed=Kunne ikkje kopla til Tor-kontrollport.
+torlauncher.tor_failed_to_start=Tor klarte ikkje å starta opp.
 torlauncher.tor_control_failed=Failed to take control of Tor.
-torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network 
connection.
+torlauncher.tor_bootstrap_failed=Tor klarte ikkje å kopla til eit samband med 
Tor-nettverket.
 torlauncher.tor_bootstrap_failed_details=%1$S feila (%2$S).
 
-torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
+torlauncher.unable_to_start_tor=Tor kunne ikkje starta.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
 torlauncher.torrc_missing=torrc-fila manglar
 torlauncher.datadir_missing=The Tor data directory does not exist.

___
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-01-26 Thread translation 
commit 567fb5820b96971215eab2e62154bc6ad922967e
Author: Translation commit bot 
Date:   Tue Jan 26 21:15:54 2016 +

Update translations for tails-misc
---
 nn.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nn.po b/nn.po
index 512b638..42ee9a5 100644
--- a/nn.po
+++ b/nn.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-04 11:56+0100\n"
-"PO-Revision-Date: 2016-01-06 09:25+\n"
+"POT-Creation-Date: 2016-01-25 17:49+0100\n"
+"PO-Revision-Date: 2016-01-26 20:58+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Norwegian Nynorsk 
(http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"

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

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

2016-01-26 Thread translation 
commit fa20e4eac4f2cd4bc4b9aad6965d28e22c2313d6
Author: Translation commit bot 
Date:   Tue Jan 26 21:16:06 2016 +

Update translations for torbutton-brandproperties
---
 nn/brand.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nn/brand.properties b/nn/brand.properties
index 0062782..59acbe5 100644
--- a/nn/brand.properties
+++ b/nn/brand.properties
@@ -13,4 +13,4 @@ homePageImport=Importer heimesida di frå %S
 homePageMigrationPageTitle=Heimesideval
 homePageMigrationDescription=Vel heimesida du ynskjer å nytta:
 
-syncBrandShortName=Synk
+syncBrandShortName=Synkroniser

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

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

2016-01-26 Thread translation 
commit 0f02fe76d2f1d03513622b0f2d1f0a44a2161099
Author: Translation commit bot 
Date:   Tue Jan 26 21:16:11 2016 +

Update translations for torbutton-brandproperties_completed
---
 nn/brand.properties |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nn/brand.properties b/nn/brand.properties
index 20f68fc..59acbe5 100644
--- a/nn/brand.properties
+++ b/nn/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=Tor Browser
 brandShortName=Tor Browser
 brandFullName=Tor Browser
 vendorShortName=Tor-prosjektet
@@ -12,4 +13,4 @@ homePageImport=Importer heimesida di frå %S
 homePageMigrationPageTitle=Heimesideval
 homePageMigrationDescription=Vel heimesida du ynskjer å nytta:
 
-syncBrandShortName=Synk
+syncBrandShortName=Synkroniser

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

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

2016-01-26 Thread translation 
commit 4e4a86419c8a485436fc5a9b1cbad320f13ca731
Author: Translation commit bot 
Date:   Tue Jan 26 21:17:21 2016 +

Update translations for torbutton-abouttbupdatedtd
---
 nn/abouttbupdate.dtd |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nn/abouttbupdate.dtd b/nn/abouttbupdate.dtd
index 37567bd..a1a0804 100644
--- a/nn/abouttbupdate.dtd
+++ b/nn/abouttbupdate.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] [orbot/master] only build for x86 and armeabi

2016-01-26 Thread n8fr8 
commit 3be93a0eaf0eb67da8e20edb3abfb440fd6f0732
Author: Nathan Freitas 
Date:   Tue Jan 26 18:20:45 2016 -0500

only build for x86 and armeabi
---
 jni/Application.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jni/Application.mk b/jni/Application.mk
index 7d4d00d..554a462 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,4 +1,4 @@
-APP_ABI:= armeabi armeabi-v7a arm64-v8a mips x86
+APP_ABI:= armeabi x86
 APP_PLATFORM   := android-16
 APP_STL:= stlport_static
 NDK_TOOLCHAIN_VERSION  := 4.8



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

[tor-commits] [orbot/master] remove lib binaries

2016-01-26 Thread n8fr8 
commit 75eb36edb621f43f57f2b518f6673f9e1b3a4134
Author: Nathan Freitas 
Date:   Tue Jan 26 18:20:56 2016 -0500

remove lib binaries
---
 libs/arm64-v8a/libtun2socks.so   |  Bin 200432 -> 0 bytes
 libs/armeabi-v7a/libtun2socks.so |  Bin 121288 -> 0 bytes
 libs/armeabi/libtun2socks.so |  Bin 129472 -> 0 bytes
 libs/mips/libtun2socks.so|  Bin 284056 -> 0 bytes
 libs/x86/libtun2socks.so |  Bin 199016 -> 0 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/libs/arm64-v8a/libtun2socks.so b/libs/arm64-v8a/libtun2socks.so
deleted file mode 100755
index a505b69..000
Binary files a/libs/arm64-v8a/libtun2socks.so and /dev/null differ
diff --git a/libs/armeabi-v7a/libtun2socks.so b/libs/armeabi-v7a/libtun2socks.so
deleted file mode 100755
index e29ca51..000
Binary files a/libs/armeabi-v7a/libtun2socks.so and /dev/null differ
diff --git a/libs/armeabi/libtun2socks.so b/libs/armeabi/libtun2socks.so
deleted file mode 100755
index bce43d4..000
Binary files a/libs/armeabi/libtun2socks.so and /dev/null differ
diff --git a/libs/mips/libtun2socks.so b/libs/mips/libtun2socks.so
deleted file mode 100755
index 4808813..000
Binary files a/libs/mips/libtun2socks.so and /dev/null differ
diff --git a/libs/x86/libtun2socks.so b/libs/x86/libtun2socks.so
deleted file mode 100755
index 23b8873..000
Binary files a/libs/x86/libtun2socks.so and /dev/null differ



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

[tor-commits] [orbot/master] explicitly indicate we are building armeabi

2016-01-26 Thread n8fr8 
commit eaa2dde6119a5404fa25f02610a1517ba6b198ea
Author: Nathan Freitas 
Date:   Tue Jan 26 18:29:37 2016 -0500

explicitly indicate we are building armeabi
---
 make-release-build |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/make-release-build b/make-release-build
index d7ddf06..6b54f74 100755
--- a/make-release-build
+++ b/make-release-build
@@ -69,8 +69,9 @@ fi
 
 faketime "$TIMESTAMP" $ANDROID_NDK_HOME/ndk-build
 
+#clean, build, clean and build!
 faketime "$TIMESTAMP" make -C external clean
-faketime "$TIMESTAMP" make -C external
+faketime "$TIMESTAMP" APP_ABI=armeabi make -C external
 faketime "$TIMESTAMP" make -C external clean
 faketime "$TIMESTAMP" APP_ABI=x86 make -C external
 

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

[tor-commits] [orbot/master] add make calls for both armeabi and x86 with clean

2016-01-26 Thread n8fr8 
commit 1b76c3636ec28fc6266abd0e9dcec77da82f2b8c
Author: Nathan Freitas 
Date:   Tue Jan 26 18:21:05 2016 -0500

add make calls for both armeabi and x86 with clean
---
 make-release-build |3 +++
 1 file changed, 3 insertions(+)

diff --git a/make-release-build b/make-release-build
index 19dc5b7..d7ddf06 100755
--- a/make-release-build
+++ b/make-release-build
@@ -69,7 +69,10 @@ fi
 
 faketime "$TIMESTAMP" $ANDROID_NDK_HOME/ndk-build
 
+faketime "$TIMESTAMP" make -C external clean
 faketime "$TIMESTAMP" make -C external
+faketime "$TIMESTAMP" make -C external clean
+faketime "$TIMESTAMP" APP_ABI=x86 make -C external
 
 ./setup-ant
 



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