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

2016-11-01 Thread translation 
commit 6faff6bca44c9fef382ae2e47df53ba0da1e3b09
Author: Translation commit bot 
Date:   Tue Nov 1 19:19:15 2016 +

Update translations for tor-messenger-uiproperties
---
 bn/ui.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bn/ui.properties b/bn/ui.properties
index de5c232..27ba5ac 100644
--- a/bn/ui.properties
+++ b/bn/ui.properties
@@ -2,7 +2,7 @@ start.label=Start private conversation
 end.label=End private conversation
 refresh.label=Refresh private conversation
 auth.label=Verify your contact's identity
-auth.cancel=Cancel
+auth.cancel=বাতিল
 auth.cancelAccessKey=C
 auth.error=An error occurred while verifying your contact's identity.
 auth.success=Verifying your contact's identity completed successfully.

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

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

2016-11-01 Thread translation 
commit 12fc14b5c09ff752647a83a320e40b1582d01df0
Author: Translation commit bot 
Date:   Tue Nov 1 19:19:07 2016 +

Update translations for tor-messenger-privproperties
---
 ach/priv.properties | 1 +
 ady/priv.properties | 1 +
 af/priv.properties  | 1 +
 ak/priv.properties  | 1 +
 am/priv.properties  | 1 +
 ar/priv.properties  | 1 +
 arn/priv.properties | 1 +
 ast/priv.properties | 1 +
 az/priv.properties  | 1 +
 ba/priv.properties  | 1 +
 be/priv.properties  | 1 +
 bg/priv.properties  | 3 ++-
 bn/priv.properties  | 1 +
 bn_BD/priv.properties   | 2 ++
 bn_IN/priv.properties   | 1 +
 bo/priv.properties  | 1 +
 br/priv.properties  | 1 +
 brx/priv.properties | 2 ++
 bs/priv.properties  | 1 +
 ca/priv.properties  | 3 ++-
 ceb/priv.properties | 2 ++
 cs/priv.properties  | 3 ++-
 csb/priv.properties | 1 +
 cv/priv.properties  | 1 +
 cy/priv.properties  | 1 +
 da/priv.properties  | 3 ++-
 de/priv.properties  | 1 +
 dz/priv.properties  | 1 +
 el/priv.properties  | 3 ++-
 en/priv.properties  | 1 +
 en_GB/priv.properties   | 1 +
 eo/priv.properties  | 1 +
 es/priv.properties  | 1 +
 es_AR/priv.properties   | 3 ++-
 es_CL/priv.properties   | 1 +
 es_CO/priv.properties   | 1 +
 es_MX/priv.properties   | 1 +
 et/priv.properties  | 1 +
 eu/priv.properties  | 1 +
 fa/priv.properties  | 3 ++-
 fi/priv.properties  | 3 ++-
 fil/priv.properties | 1 +
 fo/priv.properties  | 1 +
 fr/priv.properties  | 1 +
 fr_CA/priv.properties   | 1 +
 fur/priv.properties | 1 +
 fy/priv.properties  | 1 +
 ga/priv.properties  | 1 +
 gd/priv.properties  | 1 +
 gl/priv.properties  | 1 +
 gu/priv.properties  | 1 +
 gu_IN/priv.properties   | 1 +
 gun/priv.properties | 1 +
 ha/priv.properties  | 1 +
 he/priv.properties  | 3 ++-
 hi/priv.properties  | 1 +
 hr/priv.properties  | 1 +
 hr_HR/priv.properties   | 3 ++-
 ht/priv.properties  | 1 +
 hu/priv.properties  | 1 +
 hy/priv.properties  | 1 +
 ia/priv.properties  | 1 +
 id/priv.properties  | 1 +
 is/priv.properties  | 1 +
 it/priv.properties  | 1 +
 ja/priv.properties  | 3 ++-
 jv/priv.properties  | 1 +
 ka/priv.properties  | 1 +
 kk/priv.properties  | 1 +
 km/priv.properties  | 1 +
 kn/priv.properties  | 1 +
 ko/priv.properties  | 1 +
 ko_KR/priv.properties   | 1 +
 ku/priv.properties  | 1 +
 ku_IQ/priv.properties   | 1 +
 kw/priv.properties  | 1 +
 ky/priv.properties  | 1 +
 la/priv.properties  | 1 +
 lb/priv.properties  | 1 +
 lg/priv.properties  | 1 +
 ln/priv.properties  | 1 +
 lo/priv.properties  | 1 +
 lt/priv.properties  | 3 ++-
 lv/priv.properties  | 3 ++-
 mg/priv.properties  | 1 +
 mi/priv.properties  | 1 +
 mk/priv.properties  | 1 +
 ml/priv.properties  | 1 +
 mn/priv.properties  | 1 +
 mr/priv.properties  | 1 +
 ms_MY/priv.properties   | 1 +
 mt/priv.properties  | 1 +
 my/priv.properties  | 1 +
 nah/priv.properties | 1 +
 nap/priv.properties | 1 +
 nb/priv.properties  | 3 ++-
 nds/priv.properties | 1 +
 ne/priv.properties  | 1 +
 nl/priv.properties  | 1 +
 nl_BE/priv.properties   | 3 ++-
 nn/priv.properties  | 1 +
 nso/priv.properties | 1 +
 oc/priv.properties  | 1 +
 om/priv.properties  | 2 ++
 or/priv.properties  | 1 +
 pa/priv.properties  | 1 +
 pap/priv.properties | 1 +
 pl/priv.properties  | 1 +
 pms/priv.properties | 1 +
 ps/priv.properties  | 1 +
 pt/priv.properties  | 1 +
 pt_BR/priv.properties   | 1 +
 ro/priv.properties  | 1 +
 ru/priv.properties  | 1 +
 ru@petr1708/priv.properties | 1 +
 scn/priv.properties | 1 +
 sco/priv.properties | 1 +
 si_LK/priv.properties   | 1 +
 sk/priv.properties  | 3 ++-
 sk_SK/priv.properties   | 3 ++-
 sl/priv.properties  | 1 +
 sl_SI/priv.properties   | 1 +
 sn/priv.properties  | 1 +
 so/priv.properties  | 1 +
 son/priv.properties | 1 +
 sq/priv.properties  | 3 ++-
 sr/priv.properties  | 1 +
 sr@latin/priv.properties| 1 +
 st/priv.properties  | 1 +
 su/priv.properties  | 1 +
 sv/priv.properties  | 3 ++-
 sw/priv.properties  | 1 +
 szl/priv.properties | 1 +
 ta/priv.properties  | 1 +
 te/priv.properties  | 1 +
 te_IN/priv.properties

[tor-commits] [translation-tools/master] Fix tor-messenger config entries

2016-11-01 Thread colin 
commit be85660bd3b6748b93e8b56557be846e8f4d3d94
Author: Colin Childs 
Date:   Tue Nov 1 14:01:21 2016 -0500

Fix tor-messenger config entries
---
 config | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config b/config
index 9d073b8..76cbb98 100644
--- a/config
+++ b/config
@@ -27,14 +27,14 @@ torbutton-aboutdialogdtd_completed 
torbutton-abouttorproperties
 torbutton-abouttorproperties_completed tails-openpgp-applet
 tails-openpgp-applet_completed torbutton-abouttbupdatedtd
 torbutton-abouttbupdatedtd_completed tails-onioncircuits 
tails-onioncircuits_completed
-tormessenger-authdtd tormessenger-authdtd_completed
-tormessenger-authproperties_completed tormessenger-authproperties
-tormessenger-fingerdtd tormessenger-fingerdtd_completed
-tormessenger-otrproperties tormessenger-otrproperties_completed
-tormessenger-prefsdtd tormessenger-prefsdtd_completed
-tormessenger-privdtd tormessenger-privdtd_completed
-tormessenger-privproperties tormessenger-privproperties_completed
-tormessenger-uiproperties tormessenger-uiproperties_completed"
+tor-messenger-authdtd tor-messenger-authdtd_completed
+tor-messenger-authproperties_completed tor-messenger-authproperties
+tor-messenger-fingerdtd tor-messenger-fingerdtd_completed
+tor-messenger-otrproperties tor-messenger-otrproperties_completed
+tor-messenger-prefsdtd tor-messenger-prefsdtd_completed
+tor-messenger-privdtd tor-messenger-privdtd_completed
+tor-messenger-privproperties tor-messenger-privproperties_completed
+tor-messenger-uiproperties tor-messenger-uiproperties_completed"
 
 PIDFILE=/srv/translation.torproject.org/run/update_translations.pid
 

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

[tor-commits] [tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1311275 - use protocol service directly instead of NS_GetFileFromURLSpec; r=mayhemer

2016-11-01 Thread gk 
commit 3c39c36f1f0ad11dbf332b538bc71cc89336cbae
Author: Liang-Heng Chen 
Date:   Wed Oct 19 20:34:00 2016 +0200

Bug 1311275 - use protocol service directly instead of 
NS_GetFileFromURLSpec; r=mayhemer

MozReview-Commit-ID: 26ElbTXr6fI

--HG--
extra : rebase_source : bad92dfad90b4cee8a850cdf29a85832f16f8149

This is a backport we need due to an assertion failure caused by a
previous patch (see: #20304). Fixes bug 20490.
---
 netwerk/socket/nsSOCKSIOLayer.cpp | 19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp 
b/netwerk/socket/nsSOCKSIOLayer.cpp
index d20fe7f..4151767 100644
--- a/netwerk/socket/nsSOCKSIOLayer.cpp
+++ b/netwerk/socket/nsSOCKSIOLayer.cpp
@@ -19,9 +19,8 @@
 #include "nsIDNSListener.h"
 #include "nsICancelable.h"
 #include "nsThreadUtils.h"
-#include "nsIURL.h"
 #include "nsIFile.h"
-#include "nsNetUtil.h"
+#include "nsIFileProtocolHandler.h"
 #include "mozilla/Logging.h"
 #include "mozilla/net/DNS.h"
 #include "mozilla/unused.h"
@@ -135,9 +134,21 @@ private:
 nsresult rv;
 MOZ_ASSERT(aProxyAddr);
 
+nsCOMPtr protocolHandler(
+do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "file", ));
+if (NS_WARN_IF(NS_FAILED(rv))) {
+return rv;
+}
+
+nsCOMPtr fileHandler(
+do_QueryInterface(protocolHandler, ));
+if (NS_WARN_IF(NS_FAILED(rv))) {
+return rv;
+}
+
 nsCOMPtr socketFile;
-rv = NS_GetFileFromURLSpec(aDomainSocketPath,
-   getter_AddRefs(socketFile));
+rv = fileHandler->GetFileFromURLSpec(aDomainSocketPath,
+ getter_AddRefs(socketFile));
 if (NS_WARN_IF(NS_FAILED(rv))) {
 return rv;
 }

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

2016-11-01 Thread nickm 
commit 25f53955f6d4fd85a7a1a50484a62d18dfa96524
Merge: cb35a7c ff3e08f
Author: Nick Mathewson 
Date:   Tue Nov 1 13:32:29 2016 -0400

Merge branch 'maint-0.2.9'

 src/test/test_options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [tor/master] Attempt to fix unit tests on netbsd

2016-11-01 Thread nickm 
commit ff3e08f2af226d9660a08ab599c7e446c42fd7b4
Author: Nick Mathewson 
Date:   Tue Nov 1 13:32:21 2016 -0400

Attempt to fix unit tests on netbsd
---
 src/test/test_options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test_options.c b/src/test/test_options.c
index 31a916f..0eada98 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -1078,7 +1078,7 @@ test_options_validate__transproxy(void *ignored)
   tt_int_op(ret, OP_EQ, -1);
   tt_assert(!msg);
 #endif
-#if defined(__FreeBSD_kernel__) || defined( DARWIN )
+#if defined(__FreeBSD_kernel__) || defined( DARWIN )  || defined(__NetBSD__)
   tdata = get_options_test_data("TransProxyType ipfw\n"
 "TransPort 127.0.0.1:123\n");
   ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, );



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

[tor-commits] [tor/maint-0.2.9] Attempt to fix unit tests on netbsd

2016-11-01 Thread nickm 
commit ff3e08f2af226d9660a08ab599c7e446c42fd7b4
Author: Nick Mathewson 
Date:   Tue Nov 1 13:32:21 2016 -0400

Attempt to fix unit tests on netbsd
---
 src/test/test_options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test_options.c b/src/test/test_options.c
index 31a916f..0eada98 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -1078,7 +1078,7 @@ test_options_validate__transproxy(void *ignored)
   tt_int_op(ret, OP_EQ, -1);
   tt_assert(!msg);
 #endif
-#if defined(__FreeBSD_kernel__) || defined( DARWIN )
+#if defined(__FreeBSD_kernel__) || defined( DARWIN )  || defined(__NetBSD__)
   tdata = get_options_test_data("TransProxyType ipfw\n"
 "TransPort 127.0.0.1:123\n");
   ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, );

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

[tor-commits] [tor/master] In circuit_pick_extend_handshake, assume all hops support EXTEND2 and ntor

2016-11-01 Thread nickm 
commit 26d7a07ad773713403a0db1c49ccb58e071763b2
Author: teor 
Date:   Thu Oct 27 15:52:46 2016 +1100

In circuit_pick_extend_handshake, assume all hops support EXTEND2 and ntor

This simplifies the function: if we have an ntor key, use ntor/EXTEND2,
otherwise, use TAP/EXTEND.

Bugfix on commit 10aa913 from 19163 in 0.2.9.3-alpha.
---
 changes/bug20472  |  4 
 src/or/circuitbuild.c | 57 +--
 2 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/changes/bug20472 b/changes/bug20472
new file mode 100644
index 000..b035037
--- /dev/null
+++ b/changes/bug20472
@@ -0,0 +1,4 @@
+  o Minor bugfixes (circuits):
+- Remove a BUG warning in circuit_pick_extend_handshake. Instead, assume
+  all nodes support EXTEND2. Use ntor whenever a key is available.
+  Bugfix on commit 10aa913 from 19163 in 0.2.9.3-alpha. Fixes bug 20472.
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index cc9b184..9893215 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -814,7 +814,8 @@ circuit_timeout_want_to_count_circ(origin_circuit_t *circ)
 /** Decide whether to use a TAP or ntor handshake for connecting to ei
  * directly, and set *cell_type_out and *handshake_type_out
  * accordingly.
- * Note that TAP handshakes are only used for direct connections:
+ * Note that TAP handshakes in CREATE cells are only used for direct
+ * connections:
  *  - from Tor2web to intro points not in the client's consensus, and
  *  - from Single Onions to rend points not in the service's consensus.
  * This is checked in onion_populate_cpath. */
@@ -823,7 +824,8 @@ circuit_pick_create_handshake(uint8_t *cell_type_out,
   uint16_t *handshake_type_out,
   const extend_info_t *ei)
 {
-  /* 030 Remove support for deciding to use TAP. */
+  /* torspec says: In general, clients SHOULD use CREATE whenever they are
+   * using the TAP handshake, and CREATE2 otherwise. */
   if (extend_info_supports_ntor(ei)) {
 *cell_type_out = CELL_CREATE2;
 *handshake_type_out = ONION_HANDSHAKE_TYPE_NTOR;
@@ -834,47 +836,31 @@ circuit_pick_create_handshake(uint8_t *cell_type_out,
   *handshake_type_out = ONION_HANDSHAKE_TYPE_TAP;
 }
 
-/** Decide whether to use a TAP or ntor handshake for connecting to ei
- * directly, and set *handshake_type_out accordingly. Decide whether,
- * in extending through node to do so, we should use an EXTEND2 or an
- * EXTEND cell to do so, and set *cell_type_out and
- * *create_cell_type_out accordingly.
- * Note that TAP handshakes are only used for extend handshakes:
+/** Decide whether to use a TAP or ntor handshake for extending to ei
+ * and set *handshake_type_out accordingly. Decide whether we should
+ * use an EXTEND2 or an EXTEND cell to do so, and set *cell_type_out
+ * and *create_cell_type_out accordingly.
+ * Note that TAP handshakes in EXTEND cells are only used:
  *  - from clients to intro points, and
  *  - from hidden services to rend points.
- * This is checked in onion_populate_cpath. */
+ * This is checked in onion_populate_cpath.
+ */
 static void
 circuit_pick_extend_handshake(uint8_t *cell_type_out,
   uint8_t *create_cell_type_out,
   uint16_t *handshake_type_out,
-  const node_t *node_prev,
   const extend_info_t *ei)
 {
   uint8_t t;
   circuit_pick_create_handshake(, handshake_type_out, ei);
 
-  /* 030 Remove support for deciding to use TAP. */
-
-  /* It is an error to extend if there is no previous node. */
-  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));
-
-  /* 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 (*handshake_type_out != ONION_HANDSHAKE_TYPE_TAP &&
-  (node_has_curve25519_onion_key(node_prev) ||
-   (routerstatus_version_supports_ntor(node_prev->rs, 1 {
+  /* torspec says: Clients SHOULD use the EXTEND format whenever sending a TAP
+   * handshake... In other cases, clients SHOULD use EXTEND2. */
+  if (*handshake_type_out != ONION_HANDSHAKE_TYPE_TAP) {
 *cell_type_out = RELAY_COMMAND_EXTEND2;
 *create_cell_type_out = CELL_CREATE2;
   } else {
+/* 030 Remove support for deciding to use TAP and EXTEND. */
 *cell_type_out = RELAY_COMMAND_EXTEND;
 *create_cell_type_out = CELL_CREATE;
   }
@@ -1030,15 +1016,10 @@ circuit_send_next_onion_skin(origin_circuit_t *circ)
   return -

[tor-commits] [tor/master] Refactor circuit_pick_create_handshake

2016-11-01 Thread nickm 
commit d81f2b5d81814b296e04e1964acf7eed79327970
Author: teor 
Date:   Mon Oct 31 17:01:33 2016 +1100

Refactor circuit_pick_create_handshake

Make the structure of circuit_pick_create_handshake consistent with
circuit_pick_extend_handshake.

No behaviour change.
---
 src/or/circuitbuild.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 9893215..cb9c146 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -829,11 +829,11 @@ circuit_pick_create_handshake(uint8_t *cell_type_out,
   if (extend_info_supports_ntor(ei)) {
 *cell_type_out = CELL_CREATE2;
 *handshake_type_out = ONION_HANDSHAKE_TYPE_NTOR;
-return;
+  } else {
+/* 030 Remove support for deciding to use TAP and EXTEND. */
+*cell_type_out = CELL_CREATE;
+*handshake_type_out = ONION_HANDSHAKE_TYPE_TAP;
   }
-
-  *cell_type_out = CELL_CREATE;
-  *handshake_type_out = ONION_HANDSHAKE_TYPE_TAP;
 }
 
 /** Decide whether to use a TAP or ntor handshake for extending to ei



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

[tor-commits] [tor/release-0.2.9] In circuit_pick_extend_handshake, assume all hops support EXTEND2 and ntor

2016-11-01 Thread nickm 
commit 26d7a07ad773713403a0db1c49ccb58e071763b2
Author: teor 
Date:   Thu Oct 27 15:52:46 2016 +1100

In circuit_pick_extend_handshake, assume all hops support EXTEND2 and ntor

This simplifies the function: if we have an ntor key, use ntor/EXTEND2,
otherwise, use TAP/EXTEND.

Bugfix on commit 10aa913 from 19163 in 0.2.9.3-alpha.
---
 changes/bug20472  |  4 
 src/or/circuitbuild.c | 57 +--
 2 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/changes/bug20472 b/changes/bug20472
new file mode 100644
index 000..b035037
--- /dev/null
+++ b/changes/bug20472
@@ -0,0 +1,4 @@
+  o Minor bugfixes (circuits):
+- Remove a BUG warning in circuit_pick_extend_handshake. Instead, assume
+  all nodes support EXTEND2. Use ntor whenever a key is available.
+  Bugfix on commit 10aa913 from 19163 in 0.2.9.3-alpha. Fixes bug 20472.
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index cc9b184..9893215 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -814,7 +814,8 @@ circuit_timeout_want_to_count_circ(origin_circuit_t *circ)
 /** Decide whether to use a TAP or ntor handshake for connecting to ei
  * directly, and set *cell_type_out and *handshake_type_out
  * accordingly.
- * Note that TAP handshakes are only used for direct connections:
+ * Note that TAP handshakes in CREATE cells are only used for direct
+ * connections:
  *  - from Tor2web to intro points not in the client's consensus, and
  *  - from Single Onions to rend points not in the service's consensus.
  * This is checked in onion_populate_cpath. */
@@ -823,7 +824,8 @@ circuit_pick_create_handshake(uint8_t *cell_type_out,
   uint16_t *handshake_type_out,
   const extend_info_t *ei)
 {
-  /* 030 Remove support for deciding to use TAP. */
+  /* torspec says: In general, clients SHOULD use CREATE whenever they are
+   * using the TAP handshake, and CREATE2 otherwise. */
   if (extend_info_supports_ntor(ei)) {
 *cell_type_out = CELL_CREATE2;
 *handshake_type_out = ONION_HANDSHAKE_TYPE_NTOR;
@@ -834,47 +836,31 @@ circuit_pick_create_handshake(uint8_t *cell_type_out,
   *handshake_type_out = ONION_HANDSHAKE_TYPE_TAP;
 }
 
-/** Decide whether to use a TAP or ntor handshake for connecting to ei
- * directly, and set *handshake_type_out accordingly. Decide whether,
- * in extending through node to do so, we should use an EXTEND2 or an
- * EXTEND cell to do so, and set *cell_type_out and
- * *create_cell_type_out accordingly.
- * Note that TAP handshakes are only used for extend handshakes:
+/** Decide whether to use a TAP or ntor handshake for extending to ei
+ * and set *handshake_type_out accordingly. Decide whether we should
+ * use an EXTEND2 or an EXTEND cell to do so, and set *cell_type_out
+ * and *create_cell_type_out accordingly.
+ * Note that TAP handshakes in EXTEND cells are only used:
  *  - from clients to intro points, and
  *  - from hidden services to rend points.
- * This is checked in onion_populate_cpath. */
+ * This is checked in onion_populate_cpath.
+ */
 static void
 circuit_pick_extend_handshake(uint8_t *cell_type_out,
   uint8_t *create_cell_type_out,
   uint16_t *handshake_type_out,
-  const node_t *node_prev,
   const extend_info_t *ei)
 {
   uint8_t t;
   circuit_pick_create_handshake(, handshake_type_out, ei);
 
-  /* 030 Remove support for deciding to use TAP. */
-
-  /* It is an error to extend if there is no previous node. */
-  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));
-
-  /* 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 (*handshake_type_out != ONION_HANDSHAKE_TYPE_TAP &&
-  (node_has_curve25519_onion_key(node_prev) ||
-   (routerstatus_version_supports_ntor(node_prev->rs, 1 {
+  /* torspec says: Clients SHOULD use the EXTEND format whenever sending a TAP
+   * handshake... In other cases, clients SHOULD use EXTEND2. */
+  if (*handshake_type_out != ONION_HANDSHAKE_TYPE_TAP) {
 *cell_type_out = RELAY_COMMAND_EXTEND2;
 *create_cell_type_out = CELL_CREATE2;
   } else {
+/* 030 Remove support for deciding to use TAP and EXTEND. */
 *cell_type_out = RELAY_COMMAND_EXTEND;
 *create_cell_type_out = CELL_CREATE;
   }
@@ -1030,15 +1016,10 @@ circuit_send_next_onion_skin(origin_circuit_t *circ)
   return -

[tor-commits] [tor/release-0.2.9] Rename routerstatus_version_supports_ntor to *_supports_extend2_cells

2016-11-01 Thread nickm 
commit 3158777d35d8e03fdd77d9c227c2d04538d5fff3
Author: teor 
Date:   Thu Oct 27 15:53:49 2016 +1100

Rename routerstatus_version_supports_ntor to *_supports_extend2_cells

This helps avoid the confusion that caused bug 20472.
Bugfix on commit 10aa913 from #19163 in tor-0.2.9.3-alpha.
---
 src/or/networkstatus.c |  6 +++---
 src/or/routerlist.c| 14 --
 src/or/routerlist.h|  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index f30fe16..49baeb8 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -2360,10 +2360,10 @@ client_would_use_router(const routerstatus_t *rs, 
time_t now,
 /* We'd drop it immediately for being too old. */
 return 0;
   }
-  if (!routerstatus_version_supports_ntor(rs, 1)) {
-/* We'd ignore it because it doesn't support ntor.
+  if (!routerstatus_version_supports_extend2_cells(rs, 1)) {
+/* We'd ignore it because it doesn't support EXTEND2 cells.
  * If we don't know the version, download the descriptor so we can
- * check if it supports ntor. */
+ * check if it supports EXTEND2 cells and ntor. */
 return 0;
   }
   return 1;
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 85eb999..56c0522 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2344,9 +2344,10 @@ router_add_running_nodes_to_smartlist(smartlist_t *sl, 
int allow_invalid,
   continue;
 if (node_is_unreliable(node, need_uptime, need_capacity, need_guard))
   continue;
-/* Don't choose nodes if we are certain they can't do ntor */
-if (node->rs && !routerstatus_version_supports_ntor(node->rs, 1))
+/* Don't choose nodes if we are certain they can't do EXTEND2 cells */
+if (node->rs && !routerstatus_version_supports_extend2_cells(node->rs, 1))
   continue;
+/* Don't choose nodes if we are certain they can't do ntor. */
 if ((node->ri || node->md) && !node_has_curve25519_onion_key(node))
   continue;
 /* Choose a node with an OR address that matches the firewall rules */
@@ -5609,13 +5610,14 @@ routerinfo_has_curve25519_onion_key(const routerinfo_t 
*ri)
   return 1;
 }
 
-/* Is rs running a tor version known to support ntor?
+/* Is rs running a tor version known to support EXTEND2 cells?
  * If allow_unknown_versions is true, return true if we can't tell
- * (from a versions line or a protocols line) whether it supports ntor.
+ * (from a versions line or a protocols line) whether it supports extend2
+ * cells.
  * Otherwise, return false if the version is unknown. */
 int
-routerstatus_version_supports_ntor(const routerstatus_t *rs,
-   int allow_unknown_versions)
+routerstatus_version_supports_extend2_cells(const routerstatus_t *rs,
+int allow_unknown_versions)
 {
   if (!rs) {
 return allow_unknown_versions;
diff --git a/src/or/routerlist.h b/src/or/routerlist.h
index 47e5445..606e908 100644
--- a/src/or/routerlist.h
+++ b/src/or/routerlist.h
@@ -207,8 +207,8 @@ int routerinfo_incompatible_with_extrainfo(const 
crypto_pk_t *ri,
signed_descriptor_t *sd,
const char **msg);
 int routerinfo_has_curve25519_onion_key(const routerinfo_t *ri);
-int routerstatus_version_supports_ntor(const routerstatus_t *rs,
-   int allow_unknown_versions);
+int routerstatus_version_supports_extend2_cells(const routerstatus_t *rs,
+int allow_unknown_versions);
 
 void routerlist_assert_ok(const routerlist_t *rl);
 const char *esc_router_info(const routerinfo_t *router);



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

[tor-commits] [tor/release-0.2.9] Refactor circuit_pick_create_handshake

2016-11-01 Thread nickm 
commit d81f2b5d81814b296e04e1964acf7eed79327970
Author: teor 
Date:   Mon Oct 31 17:01:33 2016 +1100

Refactor circuit_pick_create_handshake

Make the structure of circuit_pick_create_handshake consistent with
circuit_pick_extend_handshake.

No behaviour change.
---
 src/or/circuitbuild.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 9893215..cb9c146 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -829,11 +829,11 @@ circuit_pick_create_handshake(uint8_t *cell_type_out,
   if (extend_info_supports_ntor(ei)) {
 *cell_type_out = CELL_CREATE2;
 *handshake_type_out = ONION_HANDSHAKE_TYPE_NTOR;
-return;
+  } else {
+/* 030 Remove support for deciding to use TAP and EXTEND. */
+*cell_type_out = CELL_CREATE;
+*handshake_type_out = ONION_HANDSHAKE_TYPE_TAP;
   }
-
-  *cell_type_out = CELL_CREATE;
-  *handshake_type_out = ONION_HANDSHAKE_TYPE_TAP;
 }
 
 /** Decide whether to use a TAP or ntor handshake for extending to ei



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

[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

2016-11-01 Thread nickm 
commit cb35a7c2718eef6411ff49f3bc7b20418bfddcd2
Merge: db67867 733b245
Author: Nick Mathewson 
Date:   Tue Nov 1 13:05:45 2016 -0400

Merge branch 'maint-0.2.9'

 changes/bug20472   |  4 
 src/or/circuitbuild.c  | 65 ++
 src/or/networkstatus.c |  6 ++---
 src/or/routerlist.c| 14 ++-
 src/or/routerlist.h|  4 ++--
 5 files changed, 40 insertions(+), 53 deletions(-)

___
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/bug20472-029-v2' into maint-0.2.9

2016-11-01 Thread nickm 
commit 733b2452836dffdf6fbb64c77fd168e24f278d55
Merge: 9248466 3158777
Author: Nick Mathewson 
Date:   Tue Nov 1 13:05:33 2016 -0400

Merge remote-tracking branch 'teor/bug20472-029-v2' into maint-0.2.9

 changes/bug20472   |  4 
 src/or/circuitbuild.c  | 65 ++
 src/or/networkstatus.c |  6 ++---
 src/or/routerlist.c| 14 ++-
 src/or/routerlist.h|  4 ++--
 5 files changed, 40 insertions(+), 53 deletions(-)



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

[tor-commits] [tor/master] Rename routerstatus_version_supports_ntor to *_supports_extend2_cells

2016-11-01 Thread nickm 
commit 3158777d35d8e03fdd77d9c227c2d04538d5fff3
Author: teor 
Date:   Thu Oct 27 15:53:49 2016 +1100

Rename routerstatus_version_supports_ntor to *_supports_extend2_cells

This helps avoid the confusion that caused bug 20472.
Bugfix on commit 10aa913 from #19163 in tor-0.2.9.3-alpha.
---
 src/or/networkstatus.c |  6 +++---
 src/or/routerlist.c| 14 --
 src/or/routerlist.h|  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index f30fe16..49baeb8 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -2360,10 +2360,10 @@ client_would_use_router(const routerstatus_t *rs, 
time_t now,
 /* We'd drop it immediately for being too old. */
 return 0;
   }
-  if (!routerstatus_version_supports_ntor(rs, 1)) {
-/* We'd ignore it because it doesn't support ntor.
+  if (!routerstatus_version_supports_extend2_cells(rs, 1)) {
+/* We'd ignore it because it doesn't support EXTEND2 cells.
  * If we don't know the version, download the descriptor so we can
- * check if it supports ntor. */
+ * check if it supports EXTEND2 cells and ntor. */
 return 0;
   }
   return 1;
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 85eb999..56c0522 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2344,9 +2344,10 @@ router_add_running_nodes_to_smartlist(smartlist_t *sl, 
int allow_invalid,
   continue;
 if (node_is_unreliable(node, need_uptime, need_capacity, need_guard))
   continue;
-/* Don't choose nodes if we are certain they can't do ntor */
-if (node->rs && !routerstatus_version_supports_ntor(node->rs, 1))
+/* Don't choose nodes if we are certain they can't do EXTEND2 cells */
+if (node->rs && !routerstatus_version_supports_extend2_cells(node->rs, 1))
   continue;
+/* Don't choose nodes if we are certain they can't do ntor. */
 if ((node->ri || node->md) && !node_has_curve25519_onion_key(node))
   continue;
 /* Choose a node with an OR address that matches the firewall rules */
@@ -5609,13 +5610,14 @@ routerinfo_has_curve25519_onion_key(const routerinfo_t 
*ri)
   return 1;
 }
 
-/* Is rs running a tor version known to support ntor?
+/* Is rs running a tor version known to support EXTEND2 cells?
  * If allow_unknown_versions is true, return true if we can't tell
- * (from a versions line or a protocols line) whether it supports ntor.
+ * (from a versions line or a protocols line) whether it supports extend2
+ * cells.
  * Otherwise, return false if the version is unknown. */
 int
-routerstatus_version_supports_ntor(const routerstatus_t *rs,
-   int allow_unknown_versions)
+routerstatus_version_supports_extend2_cells(const routerstatus_t *rs,
+int allow_unknown_versions)
 {
   if (!rs) {
 return allow_unknown_versions;
diff --git a/src/or/routerlist.h b/src/or/routerlist.h
index 47e5445..606e908 100644
--- a/src/or/routerlist.h
+++ b/src/or/routerlist.h
@@ -207,8 +207,8 @@ int routerinfo_incompatible_with_extrainfo(const 
crypto_pk_t *ri,
signed_descriptor_t *sd,
const char **msg);
 int routerinfo_has_curve25519_onion_key(const routerinfo_t *ri);
-int routerstatus_version_supports_ntor(const routerstatus_t *rs,
-   int allow_unknown_versions);
+int routerstatus_version_supports_extend2_cells(const routerstatus_t *rs,
+int allow_unknown_versions);
 
 void routerlist_assert_ok(const routerlist_t *rl);
 const char *esc_router_info(const routerinfo_t *router);



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

[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'teor/bug20472-029-v2' into maint-0.2.9

2016-11-01 Thread nickm 
commit 733b2452836dffdf6fbb64c77fd168e24f278d55
Merge: 9248466 3158777
Author: Nick Mathewson 
Date:   Tue Nov 1 13:05:33 2016 -0400

Merge remote-tracking branch 'teor/bug20472-029-v2' into maint-0.2.9

 changes/bug20472   |  4 
 src/or/circuitbuild.c  | 65 ++
 src/or/networkstatus.c |  6 ++---
 src/or/routerlist.c| 14 ++-
 src/or/routerlist.h|  4 ++--
 5 files changed, 40 insertions(+), 53 deletions(-)

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

[tor-commits] [tor/maint-0.2.9] Rename routerstatus_version_supports_ntor to *_supports_extend2_cells

2016-11-01 Thread nickm 
commit 3158777d35d8e03fdd77d9c227c2d04538d5fff3
Author: teor 
Date:   Thu Oct 27 15:53:49 2016 +1100

Rename routerstatus_version_supports_ntor to *_supports_extend2_cells

This helps avoid the confusion that caused bug 20472.
Bugfix on commit 10aa913 from #19163 in tor-0.2.9.3-alpha.
---
 src/or/networkstatus.c |  6 +++---
 src/or/routerlist.c| 14 --
 src/or/routerlist.h|  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index f30fe16..49baeb8 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -2360,10 +2360,10 @@ client_would_use_router(const routerstatus_t *rs, 
time_t now,
 /* We'd drop it immediately for being too old. */
 return 0;
   }
-  if (!routerstatus_version_supports_ntor(rs, 1)) {
-/* We'd ignore it because it doesn't support ntor.
+  if (!routerstatus_version_supports_extend2_cells(rs, 1)) {
+/* We'd ignore it because it doesn't support EXTEND2 cells.
  * If we don't know the version, download the descriptor so we can
- * check if it supports ntor. */
+ * check if it supports EXTEND2 cells and ntor. */
 return 0;
   }
   return 1;
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 85eb999..56c0522 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2344,9 +2344,10 @@ router_add_running_nodes_to_smartlist(smartlist_t *sl, 
int allow_invalid,
   continue;
 if (node_is_unreliable(node, need_uptime, need_capacity, need_guard))
   continue;
-/* Don't choose nodes if we are certain they can't do ntor */
-if (node->rs && !routerstatus_version_supports_ntor(node->rs, 1))
+/* Don't choose nodes if we are certain they can't do EXTEND2 cells */
+if (node->rs && !routerstatus_version_supports_extend2_cells(node->rs, 1))
   continue;
+/* Don't choose nodes if we are certain they can't do ntor. */
 if ((node->ri || node->md) && !node_has_curve25519_onion_key(node))
   continue;
 /* Choose a node with an OR address that matches the firewall rules */
@@ -5609,13 +5610,14 @@ routerinfo_has_curve25519_onion_key(const routerinfo_t 
*ri)
   return 1;
 }
 
-/* Is rs running a tor version known to support ntor?
+/* Is rs running a tor version known to support EXTEND2 cells?
  * If allow_unknown_versions is true, return true if we can't tell
- * (from a versions line or a protocols line) whether it supports ntor.
+ * (from a versions line or a protocols line) whether it supports extend2
+ * cells.
  * Otherwise, return false if the version is unknown. */
 int
-routerstatus_version_supports_ntor(const routerstatus_t *rs,
-   int allow_unknown_versions)
+routerstatus_version_supports_extend2_cells(const routerstatus_t *rs,
+int allow_unknown_versions)
 {
   if (!rs) {
 return allow_unknown_versions;
diff --git a/src/or/routerlist.h b/src/or/routerlist.h
index 47e5445..606e908 100644
--- a/src/or/routerlist.h
+++ b/src/or/routerlist.h
@@ -207,8 +207,8 @@ int routerinfo_incompatible_with_extrainfo(const 
crypto_pk_t *ri,
signed_descriptor_t *sd,
const char **msg);
 int routerinfo_has_curve25519_onion_key(const routerinfo_t *ri);
-int routerstatus_version_supports_ntor(const routerstatus_t *rs,
-   int allow_unknown_versions);
+int routerstatus_version_supports_extend2_cells(const routerstatus_t *rs,
+int allow_unknown_versions);
 
 void routerlist_assert_ok(const routerlist_t *rl);
 const char *esc_router_info(const routerinfo_t *router);



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

[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'teor/bug20472-029-v2' into maint-0.2.9

2016-11-01 Thread nickm 
commit 733b2452836dffdf6fbb64c77fd168e24f278d55
Merge: 9248466 3158777
Author: Nick Mathewson 
Date:   Tue Nov 1 13:05:33 2016 -0400

Merge remote-tracking branch 'teor/bug20472-029-v2' into maint-0.2.9

 changes/bug20472   |  4 
 src/or/circuitbuild.c  | 65 ++
 src/or/networkstatus.c |  6 ++---
 src/or/routerlist.c| 14 ++-
 src/or/routerlist.h|  4 ++--
 5 files changed, 40 insertions(+), 53 deletions(-)

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

[tor-commits] [tor/maint-0.2.9] Refactor circuit_pick_create_handshake

2016-11-01 Thread nickm 
commit d81f2b5d81814b296e04e1964acf7eed79327970
Author: teor 
Date:   Mon Oct 31 17:01:33 2016 +1100

Refactor circuit_pick_create_handshake

Make the structure of circuit_pick_create_handshake consistent with
circuit_pick_extend_handshake.

No behaviour change.
---
 src/or/circuitbuild.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 9893215..cb9c146 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -829,11 +829,11 @@ circuit_pick_create_handshake(uint8_t *cell_type_out,
   if (extend_info_supports_ntor(ei)) {
 *cell_type_out = CELL_CREATE2;
 *handshake_type_out = ONION_HANDSHAKE_TYPE_NTOR;
-return;
+  } else {
+/* 030 Remove support for deciding to use TAP and EXTEND. */
+*cell_type_out = CELL_CREATE;
+*handshake_type_out = ONION_HANDSHAKE_TYPE_TAP;
   }
-
-  *cell_type_out = CELL_CREATE;
-  *handshake_type_out = ONION_HANDSHAKE_TYPE_TAP;
 }
 
 /** Decide whether to use a TAP or ntor handshake for extending to ei



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

[tor-commits] [tor/maint-0.2.9] In circuit_pick_extend_handshake, assume all hops support EXTEND2 and ntor

2016-11-01 Thread nickm 
commit 26d7a07ad773713403a0db1c49ccb58e071763b2
Author: teor 
Date:   Thu Oct 27 15:52:46 2016 +1100

In circuit_pick_extend_handshake, assume all hops support EXTEND2 and ntor

This simplifies the function: if we have an ntor key, use ntor/EXTEND2,
otherwise, use TAP/EXTEND.

Bugfix on commit 10aa913 from 19163 in 0.2.9.3-alpha.
---
 changes/bug20472  |  4 
 src/or/circuitbuild.c | 57 +--
 2 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/changes/bug20472 b/changes/bug20472
new file mode 100644
index 000..b035037
--- /dev/null
+++ b/changes/bug20472
@@ -0,0 +1,4 @@
+  o Minor bugfixes (circuits):
+- Remove a BUG warning in circuit_pick_extend_handshake. Instead, assume
+  all nodes support EXTEND2. Use ntor whenever a key is available.
+  Bugfix on commit 10aa913 from 19163 in 0.2.9.3-alpha. Fixes bug 20472.
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index cc9b184..9893215 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -814,7 +814,8 @@ circuit_timeout_want_to_count_circ(origin_circuit_t *circ)
 /** Decide whether to use a TAP or ntor handshake for connecting to ei
  * directly, and set *cell_type_out and *handshake_type_out
  * accordingly.
- * Note that TAP handshakes are only used for direct connections:
+ * Note that TAP handshakes in CREATE cells are only used for direct
+ * connections:
  *  - from Tor2web to intro points not in the client's consensus, and
  *  - from Single Onions to rend points not in the service's consensus.
  * This is checked in onion_populate_cpath. */
@@ -823,7 +824,8 @@ circuit_pick_create_handshake(uint8_t *cell_type_out,
   uint16_t *handshake_type_out,
   const extend_info_t *ei)
 {
-  /* 030 Remove support for deciding to use TAP. */
+  /* torspec says: In general, clients SHOULD use CREATE whenever they are
+   * using the TAP handshake, and CREATE2 otherwise. */
   if (extend_info_supports_ntor(ei)) {
 *cell_type_out = CELL_CREATE2;
 *handshake_type_out = ONION_HANDSHAKE_TYPE_NTOR;
@@ -834,47 +836,31 @@ circuit_pick_create_handshake(uint8_t *cell_type_out,
   *handshake_type_out = ONION_HANDSHAKE_TYPE_TAP;
 }
 
-/** Decide whether to use a TAP or ntor handshake for connecting to ei
- * directly, and set *handshake_type_out accordingly. Decide whether,
- * in extending through node to do so, we should use an EXTEND2 or an
- * EXTEND cell to do so, and set *cell_type_out and
- * *create_cell_type_out accordingly.
- * Note that TAP handshakes are only used for extend handshakes:
+/** Decide whether to use a TAP or ntor handshake for extending to ei
+ * and set *handshake_type_out accordingly. Decide whether we should
+ * use an EXTEND2 or an EXTEND cell to do so, and set *cell_type_out
+ * and *create_cell_type_out accordingly.
+ * Note that TAP handshakes in EXTEND cells are only used:
  *  - from clients to intro points, and
  *  - from hidden services to rend points.
- * This is checked in onion_populate_cpath. */
+ * This is checked in onion_populate_cpath.
+ */
 static void
 circuit_pick_extend_handshake(uint8_t *cell_type_out,
   uint8_t *create_cell_type_out,
   uint16_t *handshake_type_out,
-  const node_t *node_prev,
   const extend_info_t *ei)
 {
   uint8_t t;
   circuit_pick_create_handshake(, handshake_type_out, ei);
 
-  /* 030 Remove support for deciding to use TAP. */
-
-  /* It is an error to extend if there is no previous node. */
-  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));
-
-  /* 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 (*handshake_type_out != ONION_HANDSHAKE_TYPE_TAP &&
-  (node_has_curve25519_onion_key(node_prev) ||
-   (routerstatus_version_supports_ntor(node_prev->rs, 1 {
+  /* torspec says: Clients SHOULD use the EXTEND format whenever sending a TAP
+   * handshake... In other cases, clients SHOULD use EXTEND2. */
+  if (*handshake_type_out != ONION_HANDSHAKE_TYPE_TAP) {
 *cell_type_out = RELAY_COMMAND_EXTEND2;
 *create_cell_type_out = CELL_CREATE2;
   } else {
+/* 030 Remove support for deciding to use TAP and EXTEND. */
 *cell_type_out = RELAY_COMMAND_EXTEND;
 *create_cell_type_out = CELL_CREATE;
   }
@@ -1030,15 +1016,10 @@ circuit_send_next_onion_skin(origin_circuit_t *circ)
   return -

[tor-commits] [torspec/master] Merge remote-tracking branch 'dgoulet/ticket20278_01'

2016-11-01 Thread nickm 
commit 048f26a007e54d811c6577143ab8cb6fd7bc92bb
Merge: e788b8f bd8b94b
Author: Nick Mathewson 
Date:   Tue Nov 1 13:00:29 2016 -0400

Merge remote-tracking branch 'dgoulet/ticket20278_01'

 cert-spec.txt | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

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

[tor-commits] [torspec/master] cert-spec: Clarify certificate types

2016-11-01 Thread nickm 
commit bd8b94b1916c0b2b19cc4eaf9987e2854d781eef
Author: David Goulet 
Date:   Fri Oct 14 10:38:34 2016 -0400

cert-spec: Clarify certificate types

Signed-off-by: David Goulet 
---
 cert-spec.txt | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/cert-spec.txt b/cert-spec.txt
index b242022..42b7efa 100644
--- a/cert-spec.txt
+++ b/cert-spec.txt
@@ -102,17 +102,20 @@ A.1. List of certificate types
**[00],[01],[02],[03] - Reserved to avoid conflict with types used
   in CERTS cells.
 
-   [04] - signing a signing key with an identity key (Section 2.5)
+   [04] - Ed25519 signing key with an identity key
+  (see prop220 section 4.2)
 
[05] - TLS link certificate signed with ed25519 signing key
- (Section 4.2)
+  (see prop220 section 4.2)
 
[06] - Ed25519 authentication key signed with ed25519 signing key
-  (Section 4.2)
+  (see prop220 section 4.2)
 
-   **[07] - reserved for RSA identity cross-certification (Section 4.2)
+   [07] - RSA identity cross-certification
+  (see prop220 section 4.2)
 
[0A] - ntor onion key cross-certifying ntor identity key
+  (see prop228 section 2.3)
 
 A.2. List of extension types
 



___
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 'pastly/ticket20486'

2016-11-01 Thread nickm 
commit db67867a81c18901b161d23696bbecf965107089
Merge: e6d84ac d8d6d8c
Author: Nick Mathewson 
Date:   Tue Nov 1 12:55:14 2016 -0400

Merge remote-tracking branch 'pastly/ticket20486'

 changes/ticket20486 | 3 +++
 doc/tor.1.txt   | 4 ++--
 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] Update man page that HS directory does not need to exist

2016-11-01 Thread nickm 
commit d8d6d8c2066fbc2d23f2afc965a6e9f77efecb6e
Author: Matt Traudt 
Date:   Tue Nov 1 12:32:50 2016 -0400

Update man page that HS directory does not need to exist
---
 changes/ticket20486 | 3 +++
 doc/tor.1.txt   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/ticket20486 b/changes/ticket20486
new file mode 100644
index 000..9c1bb1e
--- /dev/null
+++ b/changes/ticket20486
@@ -0,0 +1,3 @@
+  o Documentation (Onion Services):
+ - tor's man page incorrectly states that HiddenServiceDir must already
+   exist. This is not true. Fixes 20486.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 221c798..1d7958d 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2334,9 +2334,9 @@ The following options are used to configure a hidden 
service.
 [[HiddenServiceDir]] **HiddenServiceDir** __DIRECTORY__::
 Store data files for a hidden service in DIRECTORY. Every hidden service
 must have a separate directory. You may use this option  multiple times to
-specify multiple services. DIRECTORY must be an existing directory.
+specify multiple services. If DIRECTORY does not exist, Tor will create it.
 (Note: in current versions of Tor, if DIRECTORY is a relative path,
-it will be relative to current
+it will be relative to the current
 working directory of Tor instance, not to its DataDirectory.  Do not
 rely on this behavior; it is not guaranteed to remain the same in future
 versions.)



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

[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

2016-11-01 Thread nickm 
commit e6d84ac04fbebdbe64587b08594f42042417d92f
Merge: 68a27da 9248466
Author: Nick Mathewson 
Date:   Tue Nov 1 12:49:13 2016 -0400

Merge branch 'maint-0.2.9'

 changes/bug20487 | 4 
 doc/tor.1.txt| 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.2.9] Add a sentence to the manpage about nonanonymous=>Socksport 0.

2016-11-01 Thread nickm 
commit b858452f944e33b175e1ef16bf94b35dcf64bf31
Author: Nick Mathewson 
Date:   Mon Oct 31 15:13:27 2016 -0400

Add a sentence to the manpage about nonanonymous=>Socksport 0.

Closes 20487.
---
 changes/bug20487 | 4 
 doc/tor.1.txt| 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/bug20487 b/changes/bug20487
new file mode 100644
index 000..4435f14
--- /dev/null
+++ b/changes/bug20487
@@ -0,0 +1,4 @@
+  o Documentation:
+- Clarify that setting HiddenServiceNonAnonymousMode requires
+  you to also set "SOCKSPort 0". Fixes bug 20487; bugfix on
+  0.2.9.3-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 9d8b631..b502e44 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2434,7 +2434,9 @@ The following options are used to configure a hidden 
service.
 [[HiddenServiceNonAnonymousMode]] **HiddenServiceNonAnonymousMode** 
**0**|**1**::
 Makes hidden services non-anonymous on this tor instance. Allows the
 non-anonymous HiddenServiceSingleHopMode. Enables direct connections in the
-server-side hidden service protocol.
+server-side hidden service protocol.  If you are using this option,
+you need to disable all client-side services on your Tor instance,
+including setting SOCKSPort to "0".
 (Default: 0)
 
 TESTING NETWORK OPTIONS



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

[tor-commits] [tor/maint-0.2.9] Merge branch 'bug20487_029' into maint-0.2.9

2016-11-01 Thread nickm 
commit 9248466f0a020e661cad185fc8eec28a18aca36c
Merge: e712b5d b858452
Author: Nick Mathewson 
Date:   Tue Nov 1 12:44:20 2016 -0400

Merge branch 'bug20487_029' into maint-0.2.9

 changes/bug20487 | 4 
 doc/tor.1.txt| 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/master] Merge branch 'bug20487_029' into maint-0.2.9

2016-11-01 Thread nickm 
commit 9248466f0a020e661cad185fc8eec28a18aca36c
Merge: e712b5d b858452
Author: Nick Mathewson 
Date:   Tue Nov 1 12:44:20 2016 -0400

Merge branch 'bug20487_029' into maint-0.2.9

 changes/bug20487 | 4 
 doc/tor.1.txt| 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.2.9] Add a sentence to the manpage about nonanonymous=>Socksport 0.

2016-11-01 Thread nickm 
commit b858452f944e33b175e1ef16bf94b35dcf64bf31
Author: Nick Mathewson 
Date:   Mon Oct 31 15:13:27 2016 -0400

Add a sentence to the manpage about nonanonymous=>Socksport 0.

Closes 20487.
---
 changes/bug20487 | 4 
 doc/tor.1.txt| 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/bug20487 b/changes/bug20487
new file mode 100644
index 000..4435f14
--- /dev/null
+++ b/changes/bug20487
@@ -0,0 +1,4 @@
+  o Documentation:
+- Clarify that setting HiddenServiceNonAnonymousMode requires
+  you to also set "SOCKSPort 0". Fixes bug 20487; bugfix on
+  0.2.9.3-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 9d8b631..b502e44 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2434,7 +2434,9 @@ The following options are used to configure a hidden 
service.
 [[HiddenServiceNonAnonymousMode]] **HiddenServiceNonAnonymousMode** 
**0**|**1**::
 Makes hidden services non-anonymous on this tor instance. Allows the
 non-anonymous HiddenServiceSingleHopMode. Enables direct connections in the
-server-side hidden service protocol.
+server-side hidden service protocol.  If you are using this option,
+you need to disable all client-side services on your Tor instance,
+including setting SOCKSPort to "0".
 (Default: 0)
 
 TESTING NETWORK OPTIONS



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

[tor-commits] [tor/master] Add a sentence to the manpage about nonanonymous=>Socksport 0.

2016-11-01 Thread nickm 
commit b858452f944e33b175e1ef16bf94b35dcf64bf31
Author: Nick Mathewson 
Date:   Mon Oct 31 15:13:27 2016 -0400

Add a sentence to the manpage about nonanonymous=>Socksport 0.

Closes 20487.
---
 changes/bug20487 | 4 
 doc/tor.1.txt| 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/bug20487 b/changes/bug20487
new file mode 100644
index 000..4435f14
--- /dev/null
+++ b/changes/bug20487
@@ -0,0 +1,4 @@
+  o Documentation:
+- Clarify that setting HiddenServiceNonAnonymousMode requires
+  you to also set "SOCKSPort 0". Fixes bug 20487; bugfix on
+  0.2.9.3-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 9d8b631..b502e44 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2434,7 +2434,9 @@ The following options are used to configure a hidden 
service.
 [[HiddenServiceNonAnonymousMode]] **HiddenServiceNonAnonymousMode** 
**0**|**1**::
 Makes hidden services non-anonymous on this tor instance. Allows the
 non-anonymous HiddenServiceSingleHopMode. Enables direct connections in the
-server-side hidden service protocol.
+server-side hidden service protocol.  If you are using this option,
+you need to disable all client-side services on your Tor instance,
+including setting SOCKSPort to "0".
 (Default: 0)
 
 TESTING NETWORK OPTIONS



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

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

2016-11-01 Thread nickm 
commit 9248466f0a020e661cad185fc8eec28a18aca36c
Merge: e712b5d b858452
Author: Nick Mathewson 
Date:   Tue Nov 1 12:44:20 2016 -0400

Merge branch 'bug20487_029' into maint-0.2.9

 changes/bug20487 | 4 
 doc/tor.1.txt| 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

___
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-11-01 Thread translation 
commit 1d720d66be2211a4eeb0fdb3f298bcf4fd00d969
Author: Translation commit bot 
Date:   Tue Nov 1 15:45:03 2016 +

Update translations for bridgedb
---
 bn/LC_MESSAGES/bridgedb.po | 47 +++---
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/bn/LC_MESSAGES/bridgedb.po b/bn/LC_MESSAGES/bridgedb.po
index 554bba3..0510f9e 100644
--- a/bn/LC_MESSAGES/bridgedb.po
+++ b/bn/LC_MESSAGES/bridgedb.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Mahmud Numan , 2016
 # Sakib Abrar , 2015
 # S. M. MAINUL KABIR , 2015
 msgid ""
@@ -10,8 +11,8 @@ 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-03-21 16:27+\n"
-"Last-Translator: S. M. MAINUL KABIR \n"
+"PO-Revision-Date: 2016-10-26 03:05+\n"
+"Last-Translator: Mahmud Numan \n"
 "Language-Team: Bengali 
(http://www.transifex.com/otf/torproject/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,15 +54,15 @@ msgstr "যোগাযোগ"
 
 #: bridgedb/https/templates/bridges.html:35
 msgid "Select All"
-msgstr "সবগুলো"
+msgstr "সবগুলো নির্বাচন করুন"
 
 #: bridgedb/https/templates/bridges.html:40
 msgid "Show QRCode"
-msgstr "QRCode দেখান"
+msgstr "QRCode দেখুন"
 
 #: bridgedb/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr ""
+msgstr "আপনার সংযুক্তি লাইনের 
কিউআর কোড"
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. "There was a problem!" in your language. For example,
@@ -70,28 +71,28 @@ msgstr ""
 #: bridgedb/https/templates/bridges.html:67
 #: bridgedb/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
-msgstr ""
+msgstr "ধূর কোথায় যেনো ঝামেলা 
হচ্ছে"
 
 #: bridgedb/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
-msgstr ""
+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 ""
+msgstr "এই কিউআর কোডে আপনার 
সুংযুক্তি লাইন দেয়া আছে, 
মোবাইল অথবা যেকোন ডিভাইসে 
আপনার সুংযুক্তি লাইন কপি করতে 
এই কিউআর কোড টুকু কিউআর কোড 
স্ক্যানার দিয়ে স্ক্যান করুন ।"
 
 #: bridgedb/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
-msgstr ""
+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 ""
+msgstr "হয়তো আপনার উচিৎ %s তে ফিরে 
যাওয়া এবং  %s ভিন্ন ধর্মী 
সংযুক্তি লাইন নির্বাচন করা "
 
 #: bridgedb/https/templates/index.html:11
 #, python-format
@@ -111,7 +112,7 @@ msgstr "ধাপ : %s2%s"
 #: bridgedb/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
-msgstr ""
+msgstr "ব্রিজ পেতে; %s এর  %s"
 
 #: bridgedb/https/templates/index.html:36
 #, python-format
@@ -121,7 +122,7 @@ msgstr "ধাপ : %s3%s "
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
+msgstr "এখন %s ব্রিজটুকু  টর 
ব্রাউজার %s তে সংযুক্ত করুন"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -130,11 +131,11 @@ msgstr ""
 #: bridgedb/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr ""
+msgstr "%s %s আমাকে শুধুই সংযুক্তি 
দাও  "
 
 #: bridgedb/https/templates/options.html:51
 msgid "Advanced Options"
-msgstr ""
+msgstr "উচ্চতর সুযোগ সমূহ"
 
 #:

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

2016-11-01 Thread translation 
commit 3c13768ba5f91a6ef53c23aa36becad390134015
Author: Translation commit bot 
Date:   Tue Nov 1 15:20:44 2016 +

Update translations for tails-iuk
---
 bn.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/bn.po b/bn.po
index 12b728e..cbe6b86 100644
--- a/bn.po
+++ b/bn.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mahmud Numan , 2016
 # Sakib Abrar , 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 16:55+0200\n"
-"PO-Revision-Date: 2016-05-26 08:49+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-10-26 14:21+\n"
+"Last-Translator: Mahmud Numan \n"
 "Language-Team: Bengali 
(http://www.transifex.com/otf/torproject/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,14 +77,14 @@ msgstr "টেইলসের এই সংস্করণ 
হালনাগা
 msgid ""
 "The available incremental upgrade requires %{space_needed}s of free space on"
 " Tails system partition,  but only %{free_space}s is available."
-msgstr ""
+msgstr "সম্ভাব্য ক্রম উন্নতির 
জন্য প্রয়োজন   সিষ্টেম এর 
টেইলস অংশে :: %{space_needed}s টুকু  মুক্ত 
মেমরী দরকার, কিন্ত বর্তমানে 
:%{space_needed}s ব্যাবহার যোগ্য "
 
 #: ../lib/Tails/IUK/Frontend.pm:335
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{memory_needed}s of free memory,"
 " but only %{free_memory}s is available."
-msgstr ""
+msgstr "সম্ভাব্য ক্রম উন্নতির 
জন্য প্রয়োজন  :: %{memory_needed}s   , কিন্ত 
বর্তমানে :%{free_memory}s ব্যাবহার 
যোগ্য "
 
 #: ../lib/Tails/IUK/Frontend.pm:357
 msgid ""
@@ -93,7 +94,7 @@ msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:361
 msgid "Error while detecting available upgrades"
-msgstr "আপগ্রেড খোজার সময় সমস্যা 
হয়েছে"
+msgstr "আপগ্রেড খোঁজার সময় সমস্যা 
হয়েছে"
 
 #: ../lib/Tails/IUK/Frontend.pm:371
 #, perl-brace-format
@@ -109,7 +110,7 @@ msgid ""
 "Download size: %{size}s\n"
 "\n"
 "Do you want to upgrade now?"
-msgstr ""
+msgstr " আপনার উচিৎ %{name}s %{version}s তে 
আপগ্রেড করা .\n নতুন ভার্সনটি 
সম্বন্ধে বিস্তারিত জানতে  
এখানে যান %{details_url}s\n আপগ্রেড 
চলাকালীন চলমান অন্যান্য 
এপ্লিকেশনসমূহ বন্ধ রাখতে 
পরামর্শ দেয়া হল \n আপগ্রেড টুকু 
ডাউনলোড হতে কিছুটা সময় লাগতে 
পারে, এর জন্য কয়েক মিনিট থেকে 
কয়েক ঘন্টা পর্যন্ত সময় ব্যায় 
হতে পারে, আপগ্রেড ডাউনলোড 
হওয়ার পর নেটওয়ার্কিং অ
কার্যকর হয়ে যাবে ।\nডাউনলোড এর 
পরিমাণ %{size}s\nআপনি কি আপগ্à
 ¦°à§‡à¦¡ করতে ইচ্ছুক ?"
 
 #: ../lib/Tails/IUK/Frontend.pm:386
 msgid "Upgrade available"
@@ -133,7 +134,7 @@ msgid ""
 "It is not possible to automatically upgrade your device to this new version: 
%{explanation}s.\n"
 "\n"
 "To learn how to do a manual upgrade, go to 
https://tails.boum.org/doc/first_steps/upgrade/#manual;
-msgstr ""
+msgstr "আপনি একটি ম্যানুয়াল 
আপগ্রেড ও করতে পারেন %{name}s 
%{version}s.\nবিস্তারিত তথ্যের জন্য , 
এখানে যান  %{details_url}s\nআপনার 
বর্তমান ডিভাইসটি বর্তমান 
সংস্করণে স্বয়ংক্রিয় আপগ্রেড 
সম্ভব নয়   %{explanation}s\nকিভাবে 
ম্যানুয়াল্ আপগ্রেড করতে হয় তা 
জানতে, এখানে যান 
https://tails.boum.org/doc/first_steps/upgrade/#manual;
 
 #: ../lib/Tails/IUK/Frontend.pm:412
 msgid "New version available"

___
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-11-01 Thread translation 
commit 87efdb3f55de2344b69c0a60abfe4593d052
Author: Translation commit bot 
Date:   Tue Nov 1 15:20:23 2016 +

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

diff --git a/ru/brand.properties b/ru/brand.properties
index 5f0d9a8..91aef01 100644
--- a/ru/brand.properties
+++ b/ru/brand.properties
@@ -2,7 +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
+brandShorterName=Обозреватель Tor
 brandShortName=Tor Browser
 brandFullName=Tor Browser
 vendorShortName=Проект Tor

___
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-11-01 Thread translation 
commit 7f7688de9fee20f0a35883d1dfd10b35e1c3f0a6
Author: Translation commit bot 
Date:   Tue Nov 1 15:20:08 2016 +

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

diff --git a/ru.po b/ru.po
index 7a62b5a..430f21d 100644
--- a/ru.po
+++ b/ru.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 16:02+0200\n"
-"PO-Revision-Date: 2016-09-03 08:57+\n"
+"POT-Creation-Date: 2016-09-19 13:02+0200\n"
+"PO-Revision-Date: 2016-10-27 13:07+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\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-torbuttondtd] Update translations for torbutton-torbuttondtd

2016-11-01 Thread translation 
commit 45cdfed2ba1b0690294f117c994e321b8aed05f5
Author: Translation commit bot 
Date:   Tue Nov 1 15:20:40 2016 +

Update translations for torbutton-torbuttondtd
---
 bg/torbutton.dtd | 12 ++--
 id/torbutton.dtd |  4 ++--
 ru/torbutton.dtd | 10 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bg/torbutton.dtd b/bg/torbutton.dtd
index bac89a1..5e97d6a 100644
--- a/bg/torbutton.dtd
+++ b/bg/torbutton.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 
@@ -25,12 +25,12 @@
 
 
 
-
+
 
 
-
+
 
-
+
 
 
 
@@ -46,7 +46,7 @@
 
 
 
-
+
 
 
 
diff --git a/id/torbutton.dtd b/id/torbutton.dtd
index 6042a71..12fb72e 100644
--- a/id/torbutton.dtd
+++ b/id/torbutton.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 
diff --git a/ru/torbutton.dtd b/ru/torbutton.dtd
index 117afc5..37245a1 100644
--- a/ru/torbutton.dtd
+++ b/ru/torbutton.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 
@@ -25,12 +25,12 @@
 
 
 
-
+
 
 
-
+
 
-
+
 
 
 

___
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-11-01 Thread translation 
commit dbccd50b0e8338917d232b775595c3bf264f070d
Author: Translation commit bot 
Date:   Tue Nov 1 15:20:18 2016 +

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

diff --git a/ru/brand.properties b/ru/brand.properties
index 5f0d9a8..91aef01 100644
--- a/ru/brand.properties
+++ b/ru/brand.properties
@@ -2,7 +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
+brandShorterName=Обозреватель Tor
 brandShortName=Tor Browser
 brandFullName=Tor Browser
 vendorShortName=Проект Tor

___
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-11-01 Thread translation 
commit 718d2e6ede8e4a7211bd7d989825e4b05732f652
Author: Translation commit bot 
Date:   Tue Nov 1 15:20:04 2016 +

Update translations for tails-misc
---
 bn.po | 4 ++--
 ru.po | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bn.po b/bn.po
index b869ba1..f8adaa8 100644
--- a/bn.po
+++ b/bn.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 16:02+0200\n"
-"PO-Revision-Date: 2016-09-03 08:57+\n"
+"POT-Creation-Date: 2016-09-19 13:02+0200\n"
+"PO-Revision-Date: 2016-10-26 14:23+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Bengali 
(http://www.transifex.com/otf/torproject/language/bn/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ru.po b/ru.po
index 7a62b5a..430f21d 100644
--- a/ru.po
+++ b/ru.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 16:02+0200\n"
-"PO-Revision-Date: 2016-09-03 08:57+\n"
+"POT-Creation-Date: 2016-09-19 13:02+0200\n"
+"PO-Revision-Date: 2016-10-27 13:07+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\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/https_everywhere] Update translations for https_everywhere

2016-11-01 Thread translation 
commit 01260f1694e02acf920343621e2acadf2c76a0b6
Author: Translation commit bot 
Date:   Tue Nov 1 15:19:01 2016 +

Update translations for https_everywhere
---
 bn/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bn/https-everywhere.dtd b/bn/https-everywhere.dtd
index c9ba28e..9e53428 100644
--- a/bn/https-everywhere.dtd
+++ b/bn/https-everywhere.dtd
@@ -52,6 +52,6 @@
 
 
 
-
+
 
 

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

[tor-commits] [metrics-web/master] Use metrics-lib's getHidserv*() in hidserv module.

2016-11-01 Thread karsten 
commit 96d8de82010a2ee52597c6e5d28c6bcb47a22646
Author: Karsten Loesing 
Date:   Mon Oct 31 21:36:34 2016 +0100

Use metrics-lib's getHidserv*() in hidserv module.

When Metrics' hidserv module was written in March 2015, metrics-lib
did not support hidserv-* lines in extra-info descriptors, so it had
to implement its own parsing code and parse extra-info descriptors a
second time.

This has changed in December 2015 with metrics-lib 1.1.0 adding
"support for hidden-service statistics in extra-info descriptors".

It's time to replace that custom parsing code in Metrics' hidserv
module and use the methods provided by metrics-lib.

Implements #20510.
---
 .../src/org/torproject/metrics/hidserv/Parser.java | 95 ++
 1 file changed, 24 insertions(+), 71 deletions(-)

diff --git a/modules/hidserv/src/org/torproject/metrics/hidserv/Parser.java 
b/modules/hidserv/src/org/torproject/metrics/hidserv/Parser.java
index 0acdb17..2ef404e 100644
--- a/modules/hidserv/src/org/torproject/metrics/hidserv/Parser.java
+++ b/modules/hidserv/src/org/torproject/metrics/hidserv/Parser.java
@@ -13,7 +13,6 @@ import org.torproject.descriptor.RelayNetworkStatusConsensus;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -24,7 +23,6 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Scanner;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.SortedSet;
@@ -198,6 +196,8 @@ public class Parser {
 this.reportedHidServStatsFile, this.reportedHidServStats);
   }
 
+  private static final String BIN_SIZE = "bin_size";
+
   /** Parses the given extra-info descriptor by extracting its fingerprint
* and contained hidserv-* lines.
*
@@ -209,85 +209,38 @@ public class Parser {
 /* Extract the fingerprint from the parsed descriptor. */
 String fingerprint = extraInfoDescriptor.getFingerprint();
 
-/* Parse the descriptor once more to extract any hidserv-* lines.
- * This is necessary, because these lines are not yet supported by the
- * descriptor-parsing library. */
-Scanner scanner = new Scanner(new ByteArrayInputStream(
-extraInfoDescriptor.getRawDescriptorBytes()));
-Long statsEndMillis = null;
-Long statsIntervalSeconds = null;
-Long rendRelayedCells = null;
-Long rendRelayedCellsBinSize = null;
-Long dirOnionsSeen = null;
-Long dirOnionsSeenBinSize = null;
-try {
-  while (scanner.hasNext()) {
-String line = scanner.nextLine();
-if (line.startsWith("hidserv-")) {
-  String[] parts = line.split(" ");
-  if (parts[0].equals("hidserv-stats-end")) {
-/* Parse statistics end and statistics interval length. */
-if (parts.length != 5 || !parts[3].startsWith("(")
-|| !parts[4].equals("s)")) {
-  /* Will warn below, because statsEndMillis is still null. */
-  continue;
-}
-statsEndMillis = DateTimeHelper.parse(parts[1] + " "
-+ parts[2]);
-statsIntervalSeconds = Long.parseLong(parts[3].substring(1));
-  } else if (parts[0].equals("hidserv-rend-relayed-cells")) {
-/* Parse the reported number of cells on rendezvous circuits
- * and the bin size used by the relay to obfuscate that
- * number. */
-if (parts.length != 5
-|| !parts[4].startsWith("bin_size=")) {
-  /* Will warn below, because rendRelayedCells is still
-   * null. */
-  continue;
-}
-rendRelayedCells = Long.parseLong(parts[1]);
-rendRelayedCellsBinSize =
-Long.parseLong(parts[4].substring(9));
-  } else if (parts[0].equals("hidserv-dir-onions-seen")) {
-/* Parse the reported number of distinct .onion addresses and
- * the bin size used by the relay to obfuscate that number. */
-if (parts.length != 5
-|| !parts[4].startsWith("bin_size=")) {
-  /* Will warn below, because dirOnionsSeen is still null. */
-  continue;
-}
-dirOnionsSeen = Long.parseLong(parts[1]);
-dirOnionsSeenBinSize = Long.parseLong(parts[4].substring(9));
-  }
-}
-  }
-} catch (NumberFormatException e) {
-  e.printStackTrace();
-  return;
-}
-
 /* If the descriptor did not contain any of the expected hidserv-*
  * lines, don't do anything.  This applies to the majority of
  * descriptors, at least as long as only a minority of relays reports
  * these statistics. */
-if (statsEndMillis == null && rendRelayedCells == null
-&&

[tor-commits] [metrics-web/master] Some changes toward the standard metrics-project layout.

2016-11-01 Thread karsten 
commit 40d3d39361d513c083aa0f871afc518371e18be5
Author: iwakeh 
Date:   Tue Nov 1 09:37:39 2016 +0100

Some changes toward the standard metrics-project layout.
Switch to java 7 and metrics-lib 1.5.0.
connectbiderect not adapted.
---
 modules/advbwdist/build.xml| 29 +
 modules/clients/build.xml  | 29 +
 modules/collectdescs/build.xml | 31 +--
 modules/hidserv/build.xml  | 31 ++-
 modules/legacy/build.xml   | 36 ++-
 shared/build-base.xml  | 48 ++
 6 files changed, 76 insertions(+), 128 deletions(-)

diff --git a/modules/advbwdist/build.xml b/modules/advbwdist/build.xml
index 3f9d3cb..9aa187f 100644
--- a/modules/advbwdist/build.xml
+++ b/modules/advbwdist/build.xml
@@ -1,36 +1,17 @@
 
 
-  
-  
-  
+  
+  
+  
+
   
 
+
 
   
-  
-  
-  
-  
-  
-  
 
   
 
-  
-
-
-  
-
-  
-
   
 
 
-  
-  
-  
+  
+  
+  
+
   
 
+
 
   
-  
-  
-  
-  
-  
-  
 
   
 
-  
-
-
-  
-
-  
-
   
 
 
-  
-  
-  
+  
+  
+  
+
   
 
-
-  
-  
-  
-  
-  
-  
-
+
   
 
-  
-
-
-  
-
-  
-
   
 
diff --git a/modules/hidserv/build.xml b/modules/hidserv/build.xml
index 4c8729c..fe073a1 100644
--- a/modules/hidserv/build.xml
+++ b/modules/hidserv/build.xml
@@ -1,37 +1,18 @@
 
 
-  
-  
-  
+  
+  
+  
+
   
 
+
 
   
-  
-  
-  
-  
-  
-  
 
   
 
-  
-
-
-  
-
-  
-
-  
+  
 
diff --git a/modules/legacy/build.xml b/modules/legacy/build.xml
index 07ca673..252a712 100644
--- a/modules/legacy/build.xml
+++ b/modules/legacy/build.xml
@@ -1,47 +1,25 @@
 
 
-  
-  
-  
-  
-  
+  
+  
+  
+
   
 
+
 
   
-  
   
-  
-  
-  
-  
-  
 
   
 
   
-  
+  
 
-
-  
-
-  
-  
-
-  
-
   
 
   
-  
+  
 
diff --git a/shared/build-base.xml b/shared/build-base.xml
new file mode 100644
index 000..cdf4e86
--- /dev/null
+++ b/shared/build-base.xml
@@ -0,0 +1,48 @@
+
+
+  
+  
+  
+  
+  
+  
+
+  
+
+
+  
+  
+  
+  
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+

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