[tor-commits] [atlas/master] Fixes SVG downloads for Firefox 58

2017-12-13 Thread irl
commit 7d68fb16762c04360c73eb4b14798658c51e8953
Author: Iain R. Learmonth 
Date:   Thu Dec 14 05:16:23 2017 +

Fixes SVG downloads for Firefox 58

See: 
https://blog.mozilla.org/security/2017/11/27/blocking-top-level-navigations-data-urls-firefox-58/
---
 js/views/aggregate/map.js | 2 +-
 js/views/details/main.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/views/aggregate/map.js b/js/views/aggregate/map.js
index 367845c..1e1bca4 100644
--- a/js/views/aggregate/map.js
+++ b/js/views/aggregate/map.js
@@ -129,7 +129,7 @@ define([
   html = d3.select("#aggregate-map")
 .node()
 .innerHTML;
-  window.open("data:image/svg+xml;base64," + btoa(html), "SaveSVG");
+  window.open("data:data/xml;base64," + btoa(html), "SaveSVG");
 },
 render: function(query){
   document.title = "Relay Search";
diff --git a/js/views/details/main.js b/js/views/details/main.js
index 3597dca..7f0770f 100644
--- a/js/views/details/main.js
+++ b/js/views/details/main.js
@@ -163,7 +163,7 @@ define([
 .node()
 .innerHTML;
 d3.select("#save_" + g)
-.attr("href", "data:image/svg+xml;base64," + btoa(html));
+.attr("href", "data:data/xml;base64," + btoa(html));
 },
 render: function() {
 var data = {relay: this.model};

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


[tor-commits] [torspec/master] prop#249: Add myself as an author so I get blamed for anything dumb.

2017-12-13 Thread isis
commit 5fe5456988900b01eb86bd03b1224b4f5cd018fe
Author: Isis Lovecruft 
Date:   Thu Dec 14 01:24:17 2017 +

prop#249: Add myself as an author so I get blamed for anything dumb.
---
 proposals/249-large-create-cells.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/proposals/249-large-create-cells.txt 
b/proposals/249-large-create-cells.txt
index d4b2e2c..3e687de 100644
--- a/proposals/249-large-create-cells.txt
+++ b/proposals/249-large-create-cells.txt
@@ -1,7 +1,8 @@
 Filename: 249-large-create-cells.txt
 Title: Allow CREATE cells with >505 bytes of handshake data
-Authors: Nick Mathewson
+Authors: Nick Mathewson, Isis Lovecruft
 Created: 23 July 15
+Updated: 13 December 2017
 Status: Open
 
 1. Summary

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


[tor-commits] [torspec/master] prop#249: Add section on updates to required/recommended subprotocols.

2017-12-13 Thread isis
commit 3578da4f1fa02b145c2d55480089a49b60346eab
Author: Isis Lovecruft 
Date:   Thu Dec 14 01:23:16 2017 +

prop#249: Add section on updates to required/recommended subprotocols.
---
 proposals/249-large-create-cells.txt | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/proposals/249-large-create-cells.txt 
b/proposals/249-large-create-cells.txt
index 83e15f8..068ec90 100644
--- a/proposals/249-large-create-cells.txt
+++ b/proposals/249-large-create-cells.txt
@@ -220,6 +220,16 @@ Status: Open
Thus, "Handshake 1" is taken to be synonymous with "Relay 1", and
likewise "Handshake 2" is with "Relay 2".
 
+6.2. Subprotocol Recommendations
+
+   After the subprotocol additions above, we change to recommending the
+   following in the consensus:
+
+  recommended-client-protocols […] Link=5 Relay=3 Handshake=2
+  recommended-relay-protocols  […] Link=5 Relay=3 Handshake=2
+  required-client-protocols[…] Link=4-5 Relay=2-3 Handshake=1-2
+  required-relay-protocols […] Link=3-5 Relay=1-3 Handshake=1-2
+
 7. Resource management issues
 
This feature requires relays and clients to buffer EXTEND2 cell



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


[tor-commits] [torspec/master] prop#249: Add note about interaction with OOM manager.

2017-12-13 Thread isis
commit bbb7f092a0c0bcf821c30dfc01493d0887c926ae
Author: Isis Lovecruft 
Date:   Thu Dec 14 00:08:30 2017 +

prop#249: Add note about interaction with OOM manager.
---
 proposals/249-large-create-cells.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/proposals/249-large-create-cells.txt 
b/proposals/249-large-create-cells.txt
index 887001a..cbdc436 100644
--- a/proposals/249-large-create-cells.txt
+++ b/proposals/249-large-create-cells.txt
@@ -165,6 +165,9 @@ Status: Open
the buffers allocated for this data need to be counted against the
total data usage of the circuit.
 
+   Further, circuits which receive and buffer CREATE(D)2V cells MUST store
+   the time the first buffer chunk was allocated, and use it to inform the
+   OOM manager w.r.t. the amount of data used and its staleness.
 
 
 Appendix A. A rejected idea for migration



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


[tor-commits] [torspec/master] prop#249: Add detail on padding the number of bytes in each direction.

2017-12-13 Thread isis
commit 5c0962b76ff415ed088128ecfd92b0e4879ecb96
Author: Isis Lovecruft 
Date:   Thu Dec 14 01:22:31 2017 +

prop#249: Add detail on padding the number of bytes in each direction.
---
 proposals/249-large-create-cells.txt | 4 
 1 file changed, 4 insertions(+)

diff --git a/proposals/249-large-create-cells.txt 
b/proposals/249-large-create-cells.txt
index 072cffa..83e15f8 100644
--- a/proposals/249-large-create-cells.txt
+++ b/proposals/249-large-create-cells.txt
@@ -55,6 +55,10 @@ Status: Open
(The purpose of the 'ignored' fields here is future-proofing and
padding.)
 
+   Protocols MAY wish to pad to a certain multiple of bytes, or wish to pad
+   the initiator/receiver payloads to be of equal length.  This is
+   encouraged but NOT REQUIRED.
+
 3. Fragmented EXTEND2 cells
 
Without changing the current EXTEND2 cell format, we change its



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


[tor-commits] [torspec/master] Add Ticket: field for prop#140.

2017-12-13 Thread isis
commit ca22bb0f496f8984234aa1d2061f271d018bae7d
Author: Isis Lovecruft 
Date:   Wed Dec 13 23:49:33 2017 +

Add Ticket: field for prop#140.
---
 proposals/140-consensus-diffs.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/proposals/140-consensus-diffs.txt 
b/proposals/140-consensus-diffs.txt
index 7793f84..c50aba0 100644
--- a/proposals/140-consensus-diffs.txt
+++ b/proposals/140-consensus-diffs.txt
@@ -4,6 +4,7 @@ Author: Peter Palfrader
 Created: 13-Jun-2008
 Implemented-In: 0.3.1.1-alpha
 Status: Closed
+Ticket: https://bugs.torproject.org/13339
 
 0. History
 



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


[tor-commits] [torspec/master] prop#249: Add recommendation on equal number of cells in each direction.

2017-12-13 Thread isis
commit 21e79aec731e068c0ba92c50f5fa5d3f5132b003
Author: Isis Lovecruft 
Date:   Wed Dec 13 23:51:21 2017 +

prop#249: Add recommendation on equal number of cells in each direction.
---
 proposals/249-large-create-cells.txt | 8 
 1 file changed, 8 insertions(+)

diff --git a/proposals/249-large-create-cells.txt 
b/proposals/249-large-create-cells.txt
index b1967f3..c08b596 100644
--- a/proposals/249-large-create-cells.txt
+++ b/proposals/249-large-create-cells.txt
@@ -77,6 +77,14 @@ Status: Open
If any intervening cells are received, the receiver SHOULD destroy
the circuit.
 
+   Protocols which make use of CREATE(D)2V cells SHOULD send an equal number
+   of cells in either direction, to avoid trivially disclosing information
+   about the direction of the circuit: for example a relay might use the
+   fact that it saw five EXTEND2 cells in one direction and three in the
+   other to easily determine whether it is the middle relay on the onion
+   service-side or the middle relay on the client-side of a rendezvous
+   circuit.
+
 4. Interacting with RELAY_EARLY cells
 
The first EXTEND2 cell in a batch must arrive in a RELAY_EARLY cell.



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


[tor-commits] [torspec/master] prop#249: Add link specifiers and a section on new subprotocol numbers.

2017-12-13 Thread isis
commit 7af62db0b06aac937b8f349bd667ad20a9776f79
Author: Isis Lovecruft 
Date:   Thu Dec 14 00:51:52 2017 +

prop#249: Add link specifiers and a section on new subprotocol numbers.
---
 proposals/249-large-create-cells.txt | 63 ++--
 1 file changed, 61 insertions(+), 2 deletions(-)

diff --git a/proposals/249-large-create-cells.txt 
b/proposals/249-large-create-cells.txt
index cbdc436..072cffa 100644
--- a/proposals/249-large-create-cells.txt
+++ b/proposals/249-large-create-cells.txt
@@ -110,8 +110,12 @@ Status: Open
 
   EXTEND2 {
 nspec = 2;
-  { node ID for Y, taking 22 bytes. }
-  { node address for Y, taking 8 bytes }
+  lstype = [0x01 || 0x02];  (IPv4 or IPv6 node address)
+  lslen =  [0x04 || 0x16];
+  lspec =  { node address for Y, taking 8 bytes or 16 bytes};
+  lstype = 0x03;(An ed25519 node identity)
+  lslen = 32;
+  lspen = { ed25519 node ID for Y, taking 32 bytes }
 htype = {whatever the handshake type is.}
 hlen = 2000
 hdata = { the first 462 bytes of the handshake }
@@ -157,6 +161,61 @@ Status: Open
Relays MAY send CREATE2V and CREATED2V cells to relays that don't
support them, since unrecognized cell types are ignored.
 
+6.1. New Subprotocols and Subprotocol Versions
+
+   This proposal introduces, following prop#264, the following new
+   subprotocol numbers and their uses.
+
+6.1.1. Relay Subprotocol
+
+ "Relay 3" -- The OP supports all of "Relay 2", plus support for CREATE2V
+   and CREATED2V cells and their above specification for link-layer
+   authentication specifiers.
+
+6.1.2. Link Subprotocol
+
+ "Link 5": The OP supports all of "Link 1-4", plus support for the new
+   EXTEND2 semantics.  Namely, it understands that an EXTEND2 cell whose
+   "hlen" field is greater than 505 will be followed by further "hdata"
+   in fragmented EXTEND2 cells which MUST follow.  It also understands
+   that the following combination of EXTEND2 payload specifiers
+   indicates that the cell is a continuation of the earlier payload
+   portions:
+
+   nspec = 0;
+   htype = 0x;
+   hlen = 0;
+
+6.1.3. Handshake Subprotocol
+
+   Additionally, we introduce a new subprotocol, "Handshake" and the
+   following number assignments for previously occuring instances:
+
+ "Handshake 1" -- The OP supports the TAP handshake.
+
+ "Handshake 2" -- The OP supports the ntor handshake.
+
+   We also reserve the following assignments for future use:
+
+ "Handshake 3" -- The OP supports the "hybrid+null" ntor-like handshake
+   from prop#269.
+
+ "Handshake 4" -- The OP supports a(n as yet unspecified) post-quantum
+   secure hybrid handshake, that is, the "hybrid+null" handshake from
+   "Handshake 3", except with "null" part replaced with another (as yet
+   unspecified) protocol to be composed with the ntor-like ECDH-based
+   handshake.
+
+   Further handshakes MUST be specified with "Handshake" subprotocol
+   numbers, and MUST NOT be specified with "Relay" subprotocol numbers.  The
+   "Relay" subprotocol SHALL be used in the future to denote changes to
+   handshake protocol handling of CREATE* and EXTEND* cells, i.e. CREATE,
+   CREATED, CREATE_FAST, CREATED_FAST, CREATE2, CREATED2, CREATE2V,
+   CREATED2V, EXTEND, EXTENDED, EXTEND2, and EXTENDED2.
+
+   Thus, "Handshake 1" is taken to be synonymous with "Relay 1", and
+   likewise "Handshake 2" is with "Relay 2".
+
 7. Resource management issues
 
This feature requires relays and clients to buffer EXTEND2 cell



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


[tor-commits] [torspec/master] Typo fixes in prop#249, prop#276, and prop#279.

2017-12-13 Thread isis
commit 686aaf110551c6d586f069e3ae6f8be6820bce8d
Author: Isis Lovecruft 
Date:   Wed Dec 13 23:52:15 2017 +

Typo fixes in prop#249, prop#276, and prop#279.
---
 proposals/249-large-create-cells.txt   | 2 +-
 proposals/276-lower-bw-granularity.txt | 2 +-
 proposals/279-naming-layer-api.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/proposals/249-large-create-cells.txt 
b/proposals/249-large-create-cells.txt
index c08b596..54516be 100644
--- a/proposals/249-large-create-cells.txt
+++ b/proposals/249-large-create-cells.txt
@@ -146,7 +146,7 @@ Status: Open
before it's needed, we can use the new handshake types whenever both
of the involved relays support this proposal.
 
-   Clients MUST NOT sent fragmented EXTEND2 cells to relays that don't
+   Clients MUST NOT send fragmented EXTEND2 cells to relays that don't
support them, since this would cause them to close the circuit.
 
Relays MAY send CREATE2V and CREATED2V cells to relays that don't
diff --git a/proposals/276-lower-bw-granularity.txt 
b/proposals/276-lower-bw-granularity.txt
index bca544b..021aed8 100644
--- a/proposals/276-lower-bw-granularity.txt
+++ b/proposals/276-lower-bw-granularity.txt
@@ -69,6 +69,6 @@ Target: 0.3.1.x-alpha
results?
 
Is there any reason to think this amount of smoothing would not
-   be save?
+   be safe?
 
Would a time-aware smoothing mechanism work better?
diff --git a/proposals/279-naming-layer-api.txt 
b/proposals/279-naming-layer-api.txt
index 9f8c104..13cbcbc 100644
--- a/proposals/279-naming-layer-api.txt
+++ b/proposals/279-naming-layer-api.txt
@@ -53,7 +53,7 @@ Status: Draft
   idnxcnkne4qt76tg.onion
   vwakviie2ienjx6t.onion
 
-   When Proposal 224 get deployed, onion addresses will become even
+   When Proposal 224 gets deployed, onion addresses will become even
bigger: 53 base32 characters. That's:
 
 llamanymityx4fi3l6x2gyzmtmgxjyqyorj9qsb5r543izcwymle.onion



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


[tor-commits] [torspec/master] prop#249: Add example of how to avoid exhausting RELAY_EARLY cells.

2017-12-13 Thread isis
commit d3f18989ce583a348d3e525e8abee314f18fe91e
Author: Isis Lovecruft 
Date:   Wed Dec 13 23:56:25 2017 +

prop#249: Add example of how to avoid exhausting RELAY_EARLY cells.
---
 proposals/249-large-create-cells.txt | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/proposals/249-large-create-cells.txt 
b/proposals/249-large-create-cells.txt
index 54516be..887001a 100644
--- a/proposals/249-large-create-cells.txt
+++ b/proposals/249-large-create-cells.txt
@@ -88,7 +88,12 @@ Status: Open
 4. Interacting with RELAY_EARLY cells
 
The first EXTEND2 cell in a batch must arrive in a RELAY_EARLY cell.
-   The others MAY arrive in RELAY_EARLY cells.
+   The others MAY arrive in RELAY_EARLY cells.  For many handshakes, for
+   the possible lengths of many types of circuits, sending all EXTEND2 cells
+   inside RELAY_EARLY cells will not be possible.  For example, for a
+   fragmented EXTEND2 cell with parts A B C D E, A is the only fragment that
+   MUST be sent within a RELAY_EARLY.  For parts B C D E, these are merely
+   sent as EXTEND2{CREATE2V} cells.
 
Note that this change leaks the size of the handshake being used to
intermediate relays.  We should analyze this and see whether it matters.



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


[tor-commits] [torspec/master] prop#249: Add note on padding being randomness or zeroes.

2017-12-13 Thread isis
commit 03a9d4f13431f6f09b3d8c26c6b01dcbaf9685ae
Author: Isis Lovecruft 
Date:   Wed Dec 13 23:50:29 2017 +

prop#249: Add note on padding being randomness or zeroes.
---
 proposals/249-large-create-cells.txt | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/proposals/249-large-create-cells.txt 
b/proposals/249-large-create-cells.txt
index b7505c6..b1967f3 100644
--- a/proposals/249-large-create-cells.txt
+++ b/proposals/249-large-create-cells.txt
@@ -46,11 +46,11 @@ Status: Open
  };
 
The 'ignored' fields, which extend to the end of the variable-length
-   cells, are reserved.  Initiators MAY set them to any length, but MUST
-   fill them with zero-valued bytes.  Responders MUST ignore them,
-   regardless of what they contain.  When a CREATE2V cell is generated
-   in response to a set of EXTEND2 cells, these fields are set by the
-   relay that receives the EXTEND2 cells.
+   cells, are reserved.  Initiators MAY set them to any length, and MUST
+   fill them with either zero-valued bytes or pseudo-random bytes.
+   Responders MUST ignore them, regardless of what they contain.  When a
+   CREATE2V cell is generated in response to a set of EXTEND2 cells, these
+   fields are set by the relay that receives the EXTEND2 cells.
 
(The purpose of the 'ignored' fields here is future-proofing and
padding.)



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


[tor-commits] [torspec/master] prop#249: Add section on new consensus parameters.

2017-12-13 Thread isis
commit c119bd7800b1489aa178da7c5c2b1dfdc323ff27
Author: Isis Lovecruft 
Date:   Thu Dec 14 01:23:52 2017 +

prop#249: Add section on new consensus parameters.
---
 proposals/249-large-create-cells.txt | 8 
 1 file changed, 8 insertions(+)

diff --git a/proposals/249-large-create-cells.txt 
b/proposals/249-large-create-cells.txt
index 068ec90..d4b2e2c 100644
--- a/proposals/249-large-create-cells.txt
+++ b/proposals/249-large-create-cells.txt
@@ -230,6 +230,14 @@ Status: Open
   required-client-protocols[…] Link=4-5 Relay=2-3 Handshake=1-2
   required-relay-protocols […] Link=3-5 Relay=1-3 Handshake=1-2
 
+6.2. New Consensus Parameters
+
+   We introduce the following new consensus parameters:
+
+ Create2VMaximumData SP int
+The maximum amount of "hlen" data, in bytes, which may carried in
+either direction within a set of CREATE(D)2V cells.  (default: 10240)
+
 7. Resource management issues
 
This feature requires relays and clients to buffer EXTEND2 cell



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


[tor-commits] [orbot/master] improve notifications, add refresh/newnym button

2017-12-13 Thread n8fr8
commit 546310a4965408bfb5fa445d566f59479935bfa3
Author: n8fr8 
Date:   Wed Dec 13 15:07:52 2017 -0500

improve notifications, add refresh/newnym button
---
 .../android/settings/SettingsPreferences.java  |   9 +-
 .../res/layout/layout_notification_expanded.xml| 106 -
 .../org/torproject/android/service/TorService.java |  87 +
 .../res/drawable-hdpi/ic_refresh_white_24dp.png| Bin 0 -> 387 bytes
 .../res/drawable-mdpi/ic_refresh_white_24dp.png| Bin 0 -> 254 bytes
 .../res/drawable-xhdpi/ic_refresh_white_24dp.png   | Bin 0 -> 509 bytes
 .../res/drawable-xxhdpi/ic_refresh_white_24dp.png  | Bin 0 -> 734 bytes
 .../res/drawable-xxxhdpi/ic_refresh_white_24dp.png | Bin 0 -> 967 bytes
 .../res/layout/layout_notification_expanded.xml|  42 
 9 files changed, 71 insertions(+), 173 deletions(-)

diff --git 
a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java 
b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
index a51c1097..42e09da1 100644
--- a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
+++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
@@ -14,6 +14,7 @@ import android.preference.PreferenceActivity;
 
 import org.torproject.android.OrbotApp;
 import org.torproject.android.R;
+import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.util.TorServiceUtils;
 
 import java.util.Locale;
@@ -43,15 +44,9 @@ public class SettingsPreferences
 public boolean onPreferenceChange(Preference preference, Object 
newValue) {
 String language = (String) newValue;
 if (preference == prefLocale) {
-SharedPreferences settings = TorServiceUtils
-.getSharedPrefs(getApplicationContext());
-
-String lang = settings.getString("pref_default_locale",
-Locale.getDefault().getLanguage());
 OrbotApp app = (OrbotApp) getApplication();
 Languages.setLanguage(app, language, true);
-lang = settings.getString("pref_default_locale",
-Locale.getDefault().getLanguage());
+Prefs.setDefaultLocale(language);
 OrbotApp.forceChangeLanguage(SettingsPreferences.this);
 }
 return false;
diff --git a/app/src/main/res/layout/layout_notification_expanded.xml 
b/app/src/main/res/layout/layout_notification_expanded.xml
deleted file mode 100644
index aab1d6de..
--- a/app/src/main/res/layout/layout_notification_expanded.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-http://schemas.android.com/apk/res/android;
-xmlns:internal="http://schemas.android.com/apk/prv/res/android;
-android:id="@+id/status_bar_latest_event_content"
-android:layout_width="match_parent"
-android:layout_height="wrap_content"
->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/TorService.java 
b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index 4898b006..77fa1cdf 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -24,6 +24,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.database.Cursor;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -37,6 +38,7 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.RemoteViews;
+import android.widget.Toast;
 
 import com.jrummyapps.android.shell.CommandResult;
 import com.jrummyapps.android.shell.Shell;
@@ -262,19 +264,6 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
 
 mNotifyBuilder.setContentIntent(pendIntent);
 
-/**
-//Restart intent
-Intent yesReceive = new Intent();
-yesReceive.setAction("Restart");
-PendingIntent pendingIntentYes = 
PendingIntent.getBroadcast(this, 12345, yesReceive, 
PendingIntent.FLAG_UPDATE_CURRENT);
-mNotifyBuilder.addAction(R.drawable.ic_stat_tor_off, 
"Restart", pendingIntentYes);
-//Maybe intent
-**/
-
-Intent maybeReceive = new Intent();
-maybeReceive.setAction("Identity");
-PendingIntent pendingIntentMaybe = 
PendingIntent.getBroadcast(this, 12345, maybeReceive, 

[tor-commits] [orbot/master] more UI updates

2017-12-13 Thread n8fr8
commit d9bd32a646c7ad9c698dfd898589dacaac3694b5
Author: n8fr8 
Date:   Fri Dec 8 16:11:34 2017 -0500

more UI updates
---
 .../org/torproject/android/OrbotMainActivity.java  |  52 ---
 app/src/main/res/layout/layout_main.xml| 160 +
 app/src/main/res/layout/layout_orbot_control.xml   |  99 -
 app/src/main/res/values/strings.xml|   4 +-
 4 files changed, 166 insertions(+), 149 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 88637331..1b006ae6 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -70,6 +70,7 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.GestureDetector.SimpleOnGestureListener;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -264,23 +265,30 @@ public class OrbotMainActivity extends AppCompatActivity
 setSupportActionBar(toolbar);
 
 mDrawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+/**
   mDrawerToggle = new ActionBarDrawerToggle(
   this,  mDrawer,
   toolbar,
   R.string.btn_okay, R.string.btn_cancel
-  );
+  );**/
 
 
-  getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-  getSupportActionBar().setHomeButtonEnabled(true);
+  //getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+  //getSupportActionBar().setHomeButtonEnabled(true);
   
-  mDrawer.setDrawerListener(mDrawerToggle);
-  mDrawerToggle.syncState();
+  //mDrawer.setDrawerListener(mDrawerToggle);
+  //mDrawerToggle.syncState();
 
 mTxtOrbotLog = (TextView)findViewById(R.id.orbotLog);
 
 lblStatus = (TextView)findViewById(R.id.lblStatus);
-lblStatus.setOnLongClickListener(this);
+lblStatus.setOnClickListener(new View.OnClickListener() {
+@Override
+public void onClick(View v) {
+mDrawer.openDrawer(Gravity.RIGHT);
+}
+});
+
 imgStatus = (ImageProgressView)findViewById(R.id.imgStatus);
 imgStatus.setOnLongClickListener(this);
 imgStatus.setOnTouchListener(this);
@@ -432,7 +440,6 @@ public class OrbotMainActivity extends AppCompatActivity
 
});
 
-((TextView)findViewById(R.id.torInfo)).setText("Tor v" + 
BINARY_TOR_VERSION);
 
 mPulsator = (PulsatorLayout) findViewById(R.id.pulsator);
 
@@ -1327,9 +1334,8 @@ public class OrbotMainActivity extends AppCompatActivity
 } else if (torStatus == TorServiceConstants.STATUS_OFF) {
 
 imgStatus.setImageResource(R.drawable.toroff);
-
+lblStatus.setText("Tor v" + BINARY_TOR_VERSION);
mBtnStart.setText(R.string.menu_start);
-
 mPulsator.start();
 
 }
@@ -1388,20 +1394,7 @@ public class OrbotMainActivity extends AppCompatActivity
 @Override
 public void handleMessage(final Message msg) {

-   String newTorStatus = msg.getData().getString("status");
-   String log = (String)msg.obj;
 
-   if (torStatus == null && newTorStatus != null) //first time 
status
-   {
-   
findViewById(R.id.frameMain).setVisibility(View.VISIBLE);
-   updateStatus(log, newTorStatus);
-   
-   //now you can handle the intents properly
-   handleIntents();
-   
-   }
-   else
-   updateStatus(log, newTorStatus);
 
 switch (msg.what) {
 case MESSAGE_TRAFFIC_COUNT:
@@ -1417,7 +1410,22 @@ public class OrbotMainActivity extends AppCompatActivity
 
 break;
 default:
+String newTorStatus = msg.getData().getString("status");
+String log = (String)msg.obj;
+
+if (torStatus == null && newTorStatus != null) //first 
time status
+{
+
findViewById(R.id.frameMain).setVisibility(View.VISIBLE);
+updateStatus(log, newTorStatus);
+
+//now you can handle the intents properly
+handleIntents();
+
+}
+else
+updateStatus(log, newTorStatus);
 super.handleMessage(msg);
+break;
 }
 }
 };
diff --git a/app/src/main/res/layout/layout_main.xml 
b/app/src/main/res/layout/layout_main.xml
index a955fd0a..535efa7a 100644

[tor-commits] [orbot/master] fix handling of intents

2017-12-13 Thread n8fr8
commit 7210223b0223daf138bd078f5e7ad1e31c8ed5d3
Author: n8fr8 
Date:   Wed Dec 13 14:03:06 2017 -0500

fix handling of intents
---
 .../org/torproject/android/OrbotMainActivity.java  | 87 +-
 1 file changed, 52 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 1f8d327e..12718feb 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -570,6 +570,8 @@ public class OrbotMainActivity extends AppCompatActivity
 startActivity(new Intent(OrbotMainActivity.this, 
VPNEnableActivity.class));
 } else
 stopVpnService();
+
+addAppShortcuts();
 }
 
 private void enableHiddenServicePort(
@@ -695,7 +697,7 @@ public class OrbotMainActivity extends AppCompatActivity
 }
 }
 
-private void handleIntents() {
+private synchronized void handleIntents() {
 if (getIntent() == null)
 return;
 
@@ -1125,14 +1127,18 @@ public class OrbotMainActivity extends AppCompatActivity
 else
 updateStatus(null, torStatus);
 
-   if (Prefs.useTransparentProxying())
-   {
-   
showAlert(getString(R.string.no_transproxy_warning_short),getString(R.string.no_transproxy_warning),true);
-   Prefs.disableTransparentProxying();
-   }
+   if (Prefs.useTransparentProxying())
+   {
+   
showAlert(getString(R.string.no_transproxy_warning_short),getString(R.string.no_transproxy_warning),true);
+   Prefs.disableTransparentProxying();
+   }
 
addAppShortcuts();
 
+
+   //now you can handle the intents properly
+   handleIntents();
+
}
 
 AlertDialog aDialog = null;
@@ -1175,7 +1181,7 @@ public class OrbotMainActivity extends AppCompatActivity
  * Update the layout_main UI based on the status of {@link TorService}.
  * {@code torServiceMsg} must never be {@code null}
  */
-private void updateStatus(String torServiceMsg, String newTorStatus) {
+private synchronized void updateStatus(String torServiceMsg, String 
newTorStatus) {
 
 if (!TextUtils.isEmpty(torServiceMsg))
 {
@@ -1345,9 +1351,6 @@ public class OrbotMainActivity extends AppCompatActivity
 
findViewById(R.id.frameMain).setVisibility(View.VISIBLE);
 updateStatus(log, newTorStatus);
 
-//now you can handle the intents properly
-handleIntents();
-
 }
 else
 updateStatus(log, newTorStatus);
@@ -1443,13 +1446,6 @@ public class OrbotMainActivity extends AppCompatActivity
 {
 PackageManager pMgr = getPackageManager();
 
-ArrayList pkgIds = new ArrayList<>();
-
-String tordAppString = mPrefs.getString(PREFS_KEY_TORIFIED, "");
-StringTokenizer st = new StringTokenizer(tordAppString,"|");
-while (st.hasMoreTokens())
-pkgIds.add(st.nextToken());
-
 llBoxShortcuts.removeAllViews();
 
 //first add Orfox shortcut
@@ -1478,27 +1474,48 @@ public class OrbotMainActivity extends AppCompatActivity
 //package not installed?
 }
 
-for (final String pkgId : pkgIds)
+ArrayList pkgIds = new ArrayList<>();
+String tordAppString = mPrefs.getString(PREFS_KEY_TORIFIED, "");
+
+if (TextUtils.isEmpty(tordAppString))
 {
-try {
-ImageView iv = new ImageView(this);
-LinearLayout.LayoutParams params = new 
LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, 
LinearLayout.LayoutParams.WRAP_CONTENT);
-params.setMargins(3, 3, 3, 3);
-iv.setLayoutParams(params);
-iv.setImageDrawable(pMgr.getApplicationIcon(pkgId));
-llBoxShortcuts.addView(iv);
-iv.setOnClickListener(new View.OnClickListener() {
-@Override
-public void onClick(View v) {
-openBrowser(URL_TOR_CHECK,false, pkgId);
+/**
+TextView tv = new TextView(this);
+LinearLayout.LayoutParams params = new 
LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, 
LinearLayout.LayoutParams.WRAP_CONTENT);
+params.setMargins(3, 3, 3, 3);
+tv.setLayoutParams(params);
+tv.setText("Full Device Mode");
+llBoxShortcuts.addView(tv);
+ **/
+}
+else {
+StringTokenizer st = new StringTokenizer(tordAppString, "|");

[tor-commits] [orbot/master] fix title for tor app section

2017-12-13 Thread n8fr8
commit b68132b8c5f6cde12af312190f673441ad3218f4
Author: n8fr8 
Date:   Wed Dec 13 14:03:31 2017 -0500

fix title for tor app section
---
 app/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index 68ceadeb..f8e55528 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -389,4 +389,5 @@
   Reduced connection 
padding
   Closes relay 
connections sooner and sends less padding packets to reduce data and battery 
usage
 Please activate the VPN mode to enable 
apps to use Tor
+  Tor-Enabled Apps
 



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


[tor-commits] [orbot/master] tweak layout

2017-12-13 Thread n8fr8
commit 877406fa793229823a9f1566d140a4febfdfd279
Author: n8fr8 
Date:   Wed Dec 13 14:03:51 2017 -0500

tweak layout
---
 app/src/main/res/layout/layout_apps.xml | 2 +-
 app/src/main/res/layout/layout_main.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/layout_apps.xml 
b/app/src/main/res/layout/layout_apps.xml
index b036503f..ac967fe3 100644
--- a/app/src/main/res/layout/layout_apps.xml
+++ b/app/src/main/res/layout/layout_apps.xml
@@ -9,7 +9,7 @@
 android:id="@+id/applistview"
 android:layout_width="match_parent"
 android:layout_height="match_parent"
-android:numColumns="3"
+android:numColumns="4"
 android:layout_alignParentTop="true" >
 
 
diff --git a/app/src/main/res/layout/layout_main.xml 
b/app/src/main/res/layout/layout_main.xml
index 944fad8b..754bfc2a 100644
--- a/app/src/main/res/layout/layout_main.xml
+++ b/app/src/main/res/layout/layout_main.xml
@@ -289,7 +289,7 @@
 android:layout_height="wrap_content"
 android:gravity="center_vertical"
 android:fontFamily="sans-serif-light"
-android:text="App Shortcuts"
+android:text="@string/app_shortcuts"
 android:layout_margin="3dp"
 android:lines="1"
 />



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


[tor-commits] [orbot/master] update spuport library version

2017-12-13 Thread n8fr8
commit 5500b504599da44a9281b0d470baa9bd1f2f6069
Author: n8fr8 
Date:   Wed Dec 13 15:11:15 2017 -0500

update spuport library version
---
 app/build.gradle | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b18ce78c..10dcb765 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,24 +30,24 @@ android {
 applicationId 'org.torproject.android'
 targetSdkVersion 23
 maxSdkVersion 23
-versionCode 15510001
-versionName '15.5.1-RC-2-multi-SDK16'
+versionCode 1601
+versionName '16.0.0-ALPHA-1-multi-SDK16'
 }
 fullperm {
 dimension "free"
 minSdkVersion 23
 applicationId 'org.torproject.android'
 targetSdkVersion 25
-versionCode 15510002
-versionName '15.5.1-RC-2-multi-SDK23'
+versionCode 1602
+versionName '16.0.0-ALPHA-1-multi-SDK23'
 }
 }
 }
 
 dependencies {
 compile project(':orbotservice')
-compile 'com.android.support:support-v4:25.3.1'
-compile 'com.android.support:appcompat-v7:25.3.1'
-compile 'com.android.support:design:25.3.1'
+compile 'com.android.support:support-v4:25.4.0'
+compile 'com.android.support:appcompat-v7:25.4.0'
+compile 'com.android.support:design:25.4.0'
 compile 'pl.bclogic:pulsator4droid:1.0.3'
 }

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


[tor-commits] [orbot/master] more UI updates and small improvements

2017-12-13 Thread n8fr8
commit e6bd23a1e253824989d5b643543700d3cc8f1c26
Author: n8fr8 
Date:   Mon Dec 11 15:02:05 2017 -0500

more UI updates and small improvements
---
 .../org/torproject/android/OrbotMainActivity.java  | 267 -
 .../torproject/android/ui/AppManagerActivity.java  |  29 ++-
 .../torproject/android/ui/PromoAppsActivity.java   | 216 -
 .../main/res/drawable-xhdpi/ic_action_settings.png | Bin 716 -> 0 bytes
 .../res/drawable-xhdpi/ic_autorenew_black_36dp.png | Bin 682 -> 0 bytes
 .../drawable-xhdpi/ic_filter_none_black_36dp.png   | Bin 252 -> 0 bytes
 app/src/main/res/drawable-xhdpi/ic_launcher.png| Bin 5964 -> 0 bytes
 .../ic_playlist_add_check_black_36dp.png   | Bin 236 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_stat_notifyerr.png  | Bin 1796 -> 0 bytes
 app/src/main/res/drawable-xhdpi/ic_stat_tor.png| Bin 1161 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_stat_tor_xfer.png   | Bin 1378 -> 0 bytes
 app/src/main/res/drawable-xxxhdpi/inverse.png  | Bin 1027 -> 0 bytes
 app/src/main/res/drawable/classyfabric.png | Bin 8856 -> 0 bytes
 .../ic_autorenew_black_36dp.png| Bin
 app/src/main/res/drawable/ic_chatsecure.png| Bin 4013 -> 0 bytes
 app/src/main/res/drawable/ic_duckduckgo.png| Bin 5042 -> 0 bytes
 app/src/main/res/drawable/ic_twitter.png   | Bin 2797 -> 0 bytes
 app/src/main/res/drawable/icon_martus.png  | Bin 6763 -> 0 bytes
 app/src/main/res/drawable/icon_orfox.png   | Bin 7617 -> 0 bytes
 app/src/main/res/drawable/icon_story_maker.png | Bin 4290 -> 0 bytes
 app/src/main/res/drawable/tilebg.xml   |   4 -
 .../layout-v21/layout_notification_expanded.xml| 124 --
 app/src/main/res/layout/layout_main.xml|  52 +++-
 .../res/layout/layout_notification_expanded.xml|  40 +--
 app/src/main/res/layout/layout_promo_apps.xml  | 115 -
 app/src/main/res/menu/orbot_apps.xml   |  30 +++
 app/src/main/res/values/strings.xml|   5 +-
 .../org/torproject/android/service/TorService.java |  12 +-
 .../org/torproject/android/service/util/Prefs.java |   2 +-
 .../res/drawable-hdpi/ic_autorenew_black_36dp.png  | Bin 0 -> 546 bytes
 .../drawable-mdpi/ic_action_settings.png   | Bin
 .../drawable-mdpi/ic_autorenew_black_36dp.png  | Bin
 .../drawable-mdpi/ic_filter_none_black_36dp.png| Bin
 .../drawable-mdpi}/drawable-mdpi/ic_launcher.png   | Bin
 .../ic_playlist_add_check_black_36dp.png   | Bin
 .../drawable-mdpi/ic_stat_notifyerr.png| Bin
 .../drawable-mdpi}/drawable-mdpi/ic_stat_tor.png   | Bin
 .../drawable-mdpi/ic_stat_tor_xfer.png | Bin
 .../res/drawable-mdpi}/drawable-mdpi/inverse.png   | Bin
 .../drawable-xxhdpi/ic_autorenew_black_36dp.png| Bin
 .../drawable-xxhdpi/ic_filter_none_black_36dp.png  | Bin
 .../drawable-xxhdpi/ic_launcher.png| Bin
 .../ic_playlist_add_check_black_36dp.png   | Bin
 .../drawable-xxhdpi/ic_stat_tor.png| Bin
 .../drawable-xxhdpi/ic_stat_tor_xfer.png   | Bin
 .../drawable-xxhdpi/drawable-xxhdpi}/inverse.png   | Bin
 .../drawable-xxxhdpi/ic_autorenew_black_36dp.png   | Bin
 .../drawable-xxxhdpi/ic_filter_none_black_36dp.png | Bin
 .../drawable-xxxhdpi/ic_launcher.png   | Bin
 .../ic_playlist_add_check_black_36dp.png   | Bin
 .../drawable-xxxhdpi/ic_stat_tor.png   | Bin
 .../drawable-xxxhdpi/ic_stat_tor_xfer.png  | Bin
 .../drawable-xxxhdpi/drawable-xxxhdpi}/inverse.png | Bin
 .../res/layout/layout_notification_expanded.xml|  28 +--
 54 files changed, 283 insertions(+), 641 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 1b006ae6..de9b4285 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -23,8 +23,6 @@ import org.torproject.android.service.TorServiceConstants;
 import org.torproject.android.service.util.TorServiceUtils;
 import org.torproject.android.settings.SettingsPreferences;
 import org.torproject.android.ui.AppManagerActivity;
-import org.torproject.android.ui.ImageProgressView;
-import org.torproject.android.ui.PromoAppsActivity;
 import org.torproject.android.ui.Rotate3dAnimation;
 import org.torproject.android.ui.hiddenservices.ClientCookiesActivity;
 import org.torproject.android.ui.hiddenservices.HiddenServicesActivity;
@@ -34,6 +32,7 @@ import 
org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
 import org.torproject.android.vpn.VPNEnableActivity;
 
 import android.annotation.SuppressLint;
+import android.app.ActionBar;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
 import android.app.AlertDialog;
@@ -57,10 +56,8 @@ import android.os.Bundle;
 import 

[tor-commits] [orbot/master] don't delete installed binaries

2017-12-13 Thread n8fr8
commit f3f9162867f27531019b0ff674713825cb665dc2
Author: n8fr8 
Date:   Thu Dec 7 15:44:06 2017 -0500

don't delete installed binaries
---
 .../service/util/OtherResourceInstaller.java| 21 ++---
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java
 
b/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java
index 6c1506b3..9768432c 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java
@@ -71,9 +71,8 @@ public class OtherResourceInstaller implements 
TorServiceConstants {
 if (Build.CPU_ABI.contains("x86"))
 cpuPath = "x86";
 
-deleteDirectory(installFolder);
-
-installFolder.mkdirs();
+if (!installFolder.exists())
+installFolder.mkdirs();
 
 is = context.getAssets().open(cpuPath + '/' + OBFSCLIENT_ASSET_KEY + 
MP3_EXT);
 outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY);
@@ -220,22 +219,6 @@ public class OtherResourceInstaller implements 
TorServiceConstants {
 // Change the permissions
 Runtime.getRuntime().exec("chmod "+mode+" "+abspath).waitFor();
 }
-/**
- * Asserts that the binary files are installed in the bin directory.
- * @param ctx context
- * @param showErrors indicates if errors should be alerted
- * @return false if the binary files could not be installed
- */
-/*
-public static boolean assertIpTablesBinaries(Context ctx, boolean 
showErrors) throws Exception {
-boolean changed = false;
-
-// Check iptables_g1
-File file = new File(ctx.getDir("bin",0), "iptables");
-copyRawFile(ctx, R.raw.iptables, file, CHMOD_EXEC, false);
-
-return true;
-}*/
 
 
 private void setExecutable(File fileBin) {



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


[tor-commits] [orbot/master] fix issues with bridge selection UI

2017-12-13 Thread n8fr8
commit 47e10e780606d68ab0c559283ef777a1ca4878b5
Author: n8fr8 
Date:   Mon Dec 11 15:25:10 2017 -0500

fix issues with bridge selection UI
---
 .../org/torproject/android/OrbotMainActivity.java  | 52 +++---
 .../torproject/android/ui/AppManagerActivity.java  |  2 +-
 app/src/main/res/layout/layout_main.xml|  2 +-
 3 files changed, 9 insertions(+), 47 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index de9b4285..1f8d327e 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -97,7 +97,7 @@ import static 
android.support.v4.content.FileProvider.getUriForFile;
 import static 
org.torproject.android.binary.TorServiceConstants.BINARY_TOR_VERSION;
 
 public class OrbotMainActivity extends AppCompatActivity
-implements OrbotConstants, OnLongClickListener, OnTouchListener {
+implements OrbotConstants, OnLongClickListener {
 
 /* Useful UI bits */
 private TextView lblStatus = null; //the main text display widget
@@ -276,17 +276,12 @@ public class OrbotMainActivity extends AppCompatActivity
 
 imgStatus = (ImageView)findViewById(R.id.imgStatus);
 imgStatus.setOnLongClickListener(this);
-imgStatus.setOnTouchListener(this);
-
+
 downloadText = (TextView)findViewById(R.id.trafficDown);
 uploadText = (TextView)findViewById(R.id.trafficUp);
-
-
+
 downloadText.setText(formatCount(0) + " / " + formatTotal(0));
 uploadText.setText(formatCount(0) + " / " + formatTotal(0));
-
-// Gesture detection
-   mGestureDetector = new GestureDetector(this, new 
MyGestureDetector());
 
mBtnStart =(Button)findViewById(R.id.btnStart);
mBtnStart.setOnClickListener(new View.OnClickListener()
@@ -301,11 +296,9 @@ public class OrbotMainActivity extends AppCompatActivity

lblStatus.setText(getString(R.string.status_shutting_down));
stopTor();
}
-
}
});
 
-
mBtnVPN = (SwitchCompat)findViewById(R.id.btnVPN);

boolean canDoVPN = Build.VERSION.SDK_INT >= 
Build.VERSION_CODES.ICE_CREAM_SANDWICH;
@@ -332,15 +325,11 @@ public class OrbotMainActivity extends AppCompatActivity
 public void onCheckedChanged(CompoundButton buttonView, 
boolean isChecked)
 {
 enableVPN(isChecked);
-
-
 }
 });
 
-
}
-   
-   
+
mBtnBridges = (SwitchCompat)findViewById(R.id.btnBridges);
mBtnBridges.setChecked(Prefs.bridgesEnabled());
mBtnBridges.setOnClickListener(new View.OnClickListener ()
@@ -361,8 +350,7 @@ public class OrbotMainActivity extends AppCompatActivity
 

});
-   
-   
+
String currentExit = Prefs.getExitNodes();
int selIdx = -1;

@@ -417,14 +405,7 @@ public class OrbotMainActivity extends AppCompatActivity
 }
 
 PulsatorLayout mPulsator;
-GestureDetector mGestureDetector;
-
 
-@Override
-public boolean onTouch(View v, MotionEvent event) {
-return mGestureDetector.onTouchEvent(event);
-   }
-   
 
/*
 * Create the UI Options Menu (non-Javadoc)
@@ -823,7 +804,6 @@ public class OrbotMainActivity extends AppCompatActivity
 if (!Prefs.useVpn())
 {
 Toast.makeText(this, R.string.please_enable_vpn, 
Toast.LENGTH_LONG).show();
-
 }
 else
 {
@@ -1009,12 +989,12 @@ public class OrbotMainActivity extends AppCompatActivity
   enableBridges(true);
 
   break;
-  case 2: //amazon & azure
+  case 1: //amazon & azure
Prefs.setBridgesList("meek");
   enableBridges(true);
   
   break;
-  case 3:
+  case 2:
   showGetBridgePrompt("obfs4");
   
   break;
@@ -1444,24 +1424,6 @@ public class OrbotMainActivity extends AppCompatActivity
   
 
 }
-
-class MyGestureDetector extends SimpleOnGestureListener {
-@Override
-public boolean onFling(MotionEvent e1, MotionEvent e2, float 
velocityX, float velocityY) {
-try {
-if (torStatus == TorServiceConstants.STATUS_ON)
- 

[tor-commits] [orbot/master] work on the new UI update

2017-12-13 Thread n8fr8
commit 7303a33311fe4cabcba70ab298a1cc8e782e0a9c
Author: n8fr8 
Date:   Fri Dec 8 11:56:11 2017 -0500

work on the new UI update
---
 app/build.gradle   |   1 +
 app/src/fullperm/AndroidManifest.xml   |   6 +-
 app/src/main/AndroidManifest.xml   |   6 +-
 .../org/torproject/android/OrbotMainActivity.java  |  16 ++-
 app/src/main/res/layout/layout_main.xml| 125 ++---
 app/src/main/res/layout/layout_orbot_control.xml   |  11 --
 6 files changed, 108 insertions(+), 57 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 12f5eace..b18ce78c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -49,4 +49,5 @@ dependencies {
 compile 'com.android.support:support-v4:25.3.1'
 compile 'com.android.support:appcompat-v7:25.3.1'
 compile 'com.android.support:design:25.3.1'
+compile 'pl.bclogic:pulsator4droid:1.0.3'
 }
diff --git a/app/src/fullperm/AndroidManifest.xml 
b/app/src/fullperm/AndroidManifest.xml
index 0c1b4185..a4d678c0 100644
--- a/app/src/fullperm/AndroidManifest.xml
+++ b/app/src/fullperm/AndroidManifest.xml
@@ -1,5 +1,6 @@
 
 http://schemas.android.com/apk/res/android;
+xmlns:tools="http://schemas.android.com/tools;
 package="org.torproject.android"
 android:installLocation="auto">
 
@@ -25,8 +26,9 @@
 android:hardwareAccelerated="false"
 android:icon="@drawable/ic_launcher"
 android:label="@string/app_name"
-android:largeHeap="false"
-android:theme="@style/DefaultTheme">
+android:theme="@style/DefaultTheme"
+tools:replace="android:allowBackup"
+>
 
 http://schemas.android.com/apk/res/android;
+xmlns:tools="http://schemas.android.com/tools;
 package="org.torproject.android"
 android:installLocation="auto">
 
@@ -17,8 +18,9 @@
 android:hardwareAccelerated="false"
 android:icon="@drawable/ic_launcher"
 android:label="@string/app_name"
-android:largeHeap="false"
-android:theme="@style/DefaultTheme">
+android:theme="@style/DefaultTheme"
+tools:replace="android:allowBackup"
+>
 
+
   
-
 
+
+
 
 
+
+
+
+
+
+
 
 
+
+
+
+
+
+
 
 
 
 
-
-   
-
-
 
 
 
diff --git a/app/src/main/res/layout/layout_orbot_control.xml 
b/app/src/main/res/layout/layout_orbot_control.xml
index 4df63591..0e40e49c 100644
--- a/app/src/main/res/layout/layout_orbot_control.xml
+++ b/app/src/main/res/layout/layout_orbot_control.xml
@@ -23,17 +23,6 @@
 />
 
 
-
-
-
-
-
 https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [orbot/master] update UI tweaks for next release

2017-12-13 Thread n8fr8
commit 6a19bf6c8e6de9057f217addc72eff69c2b09508
Author: n8fr8 
Date:   Thu Dec 7 16:58:16 2017 -0500

update UI tweaks for next release
---
 .../org/torproject/android/OrbotMainActivity.java  | 108 +++
 app/src/main/res/layout-land/layout_main.xml   | 153 -
 app/src/main/res/layout/layout_main.xml| 112 ---
 app/src/main/res/layout/layout_orbot_control.xml   |  11 --
 .../org/torproject/android/service/TorService.java |   2 +-
 5 files changed, 104 insertions(+), 282 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index dcae5305..e53c8841 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -57,6 +57,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.RemoteException;
+import android.support.design.widget.Snackbar;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
@@ -64,6 +65,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.SwitchCompat;
 import android.support.v7.widget.Toolbar;
 import android.text.Html;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.GestureDetector;
@@ -102,8 +104,7 @@ public class OrbotMainActivity extends AppCompatActivity
 private TextView downloadText = null;
 private TextView uploadText = null;
 private TextView mTxtOrbotLog = null;
-
-private Button mBtnBrowser = null;
+
private Button mBtnStart = null;
 
private SwitchCompat mBtnVPN = null;
@@ -308,19 +309,6 @@ public class OrbotMainActivity extends AppCompatActivity
}
});
 
-   mBtnBrowser = (Button)findViewById(R.id.btnBrowser);
-   mBtnBrowser.setOnClickListener(new View.OnClickListener ()
-   {
-
-   @Override
-   public void onClick(View v) {
-   doTorCheck();
-   
-   }
-
-   });
-   
-   mBtnBrowser.setEnabled(false);
 
mBtnVPN = (SwitchCompat)findViewById(R.id.btnVPN);

@@ -757,7 +745,7 @@ public class OrbotMainActivity extends AppCompatActivity
 }
 }
 
-private synchronized void handleIntents() {
+private void handleIntents() {
 if (getIntent() == null)
 return;
 
@@ -832,7 +820,7 @@ public class OrbotMainActivity extends AppCompatActivity
 break;
 }
 
-updateStatus(null);
+updateStatus(null, torStatus);
 
 setIntent(null);
 
@@ -1183,7 +1171,7 @@ public class OrbotMainActivity extends AppCompatActivity
 
requestTorStatus();
 
-   updateStatus(null);
+   updateStatus(null, torStatus);
 
if (Prefs.useTransparentProxying())
{
@@ -1234,27 +1222,32 @@ public class OrbotMainActivity extends AppCompatActivity
  * Update the layout_main UI based on the status of {@link TorService}.
  * {@code torServiceMsg} must never be {@code null}
  */
-private void updateStatus(String torServiceMsg) {
+private void updateStatus(String torServiceMsg, String newTorStatus) {
+
+if (!TextUtils.isEmpty(torServiceMsg))
+{
+if (torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_HEADER)) 
{
+lblStatus.setText(torServiceMsg);
+}
+
+mTxtOrbotLog.append(torServiceMsg + '\n');
+
+}
+
+if (torStatus == null || newTorStatus.equals(torStatus)) {
+torStatus = newTorStatus;
+return;
+}
+   else
+   torStatus = newTorStatus;
 
-   if (torStatus == null)
-   return; //UI not init'd yet
-   
 if (torStatus == TorServiceConstants.STATUS_ON) {

 imgStatus.setImageResource(R.drawable.toron);
 
-mBtnBrowser.setEnabled(true);
-   mBtnStart.setText(R.string.menu_stop);
-
-if (torServiceMsg != null)
-{
-   if 
(torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_HEADER)) {
-lblStatus.setText(torServiceMsg);
-}
-}
-   else
-   lblStatus.setText(getString(R.string.status_activated));
+mBtnStart.setText(R.string.menu_stop);
 
+lblStatus.setText(getString(R.string.status_activated));
 
 boolean showFirstTime = mPrefs.getBoolean("connect_first_time", 
true);
 
@@ -1266,21 +1259,32 @@ public class 

[tor-commits] [orbot/master] don't show app selection each time you turn VPN on/off

2017-12-13 Thread n8fr8
commit 3741434eaf1149ffd17e22080c44dde17f9b47fd
Author: n8fr8 
Date:   Thu Dec 7 15:45:23 2017 -0500

don't show app selection each time you turn VPN on/off
---
 .../org/torproject/android/OrbotMainActivity.java  | 25 +-
 .../torproject/android/vpn/VPNEnableActivity.java  |  8 ---
 app/src/main/res/layout/layout_main.xml|  2 --
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 17a81806..dcae5305 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -353,13 +353,21 @@ public class OrbotMainActivity extends AppCompatActivity
 }
 });
 
+   if (PermissionManager.isLollipopOrHigher()) {
 
-findViewById(R.id.btnApps).setOnClickListener(new 
View.OnClickListener() {
-@Override
-public void onClick(View v) {
-enableVPN(true);
-}
-});
+findViewById(R.id.btnApps).setOnClickListener(new 
View.OnClickListener() {
+@Override
+public void onClick(View v) {
+
+startActivityForResult(new 
Intent(OrbotMainActivity.this, AppManagerActivity.class), 
REQUEST_VPN_APPS_SELECT);
+
+}
+});
+}
+else
+{
+findViewById(R.id.btnApps).setVisibility(View.GONE);
+}
}


@@ -621,10 +629,7 @@ public class OrbotMainActivity extends AppCompatActivity
 Prefs.putUseVpn(enable);
 
 if (enable) {
-if (PermissionManager.isLollipopOrHigher()) //let the user choose 
the apps
-startActivityForResult(new Intent(OrbotMainActivity.this, 
AppManagerActivity.class), REQUEST_VPN_APPS_SELECT);
-else
-startActivity(new Intent(OrbotMainActivity.this, 
VPNEnableActivity.class));
+startActivity(new Intent(OrbotMainActivity.this, 
VPNEnableActivity.class));
 } else
 stopVpnService();
 }
diff --git 
a/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java 
b/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java
index 9dd05d8c..7f24dabf 100644
--- a/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java
+++ b/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java
@@ -62,6 +62,9 @@ public class VPNEnableActivity extends AppCompatActivity {

public void promptStartVpnService ()
 {
+   Prefs.putUseVpn(true);
+   startVpnService();
+   /**
 
  AlertDialog dialog = new AlertDialog.Builder(this)
  .setTitle(getString(R.string.app_name) + ' ' + 
getString(R.string.apps_mode))
@@ -71,8 +74,7 @@ public class VPNEnableActivity extends AppCompatActivity {
 
@Override
public void onClick(DialogInterface dialog, int which) {
-   Prefs.putUseVpn(true);
-   startVpnService();
+

}
 
@@ -97,7 +99,7 @@ public class VPNEnableActivity extends AppCompatActivity {
  }).create();
  
  dialog.show();
- 
+ **/
  
 }
 
diff --git a/app/src/main/res/layout/layout_main.xml 
b/app/src/main/res/layout/layout_main.xml
index 030257cf..e8c93336 100644
--- a/app/src/main/res/layout/layout_main.xml
+++ b/app/src/main/res/layout/layout_main.xml
@@ -1,8 +1,6 @@
 
-
 http://schemas.android.com/apk/res/android;
-xmlns:app="http://schemas.android.com/apk/res-auto;
 
 android:orientation="vertical" android:layout_width="match_parent"
   android:layout_height="match_parent"



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


[tor-commits] [orbot/master] move "other" installer back to tor resource installer

2017-12-13 Thread n8fr8
commit 4df2fcfd5001c357cbbb7aa98f2770d3000aec87
Author: n8fr8 
Date:   Thu Dec 7 15:44:54 2017 -0500

move "other" installer back to tor resource installer
---
 .../src/main/java/org/torproject/android/service/TorService.java| 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/TorService.java 
b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index 53a40339..e90123f6 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -631,9 +631,11 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
 if (success)
 
prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit();
 
+
 OtherResourceInstaller oInstaller = new 
OtherResourceInstaller(this, appBinHome);
 oInstaller.installResources();
 }
+
 
 updateTorConfigFile ();
 isTorUpgradeAndConfigComplete = true;



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


[tor-commits] [webwml/master] Reword Sukhbir's people page entry

2017-12-13 Thread atagar
commit 34c7baf25e9de5ddaf45721b72186a1614f59faf
Author: Damian Johnson 
Date:   Wed Dec 13 11:34:23 2017 -0800

Reword Sukhbir's people page entry

Tweaking the wording per his request.
---
 about/en/corepeople.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 3be6351b..0e1fd824 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -767,7 +767,7 @@
   https://db.torproject.org/fetchkey.cgi?fingerprint=E4ACD3975427A5BA8450A1BEB01C8B006DA77FAA;>
   Sukhbir Singh
   IRC: sukhe
-  https://trac.torproject.org/projects/tor/wiki/torbirdy;>TorBirdy and 
https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger;>Tor 
Messenger developer. Volunteer on the https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam;>Community
 Team.
+  https://trac.torproject.org/projects/tor/wiki/torbirdy;>TorBirdy and 
https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger;>Tor 
Messenger developer. Member of the https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam;>Community
 Team.
 
   
 

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


[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-12-13 Thread translation
commit d7b217f5b7a0e0eba447cc7e817a4c4aeac04eba
Author: Translation commit bot 
Date:   Wed Dec 13 17:20:36 2017 +

Update translations for tor-browser-manual
---
 hu/hu.po | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hu/hu.po b/hu/hu.po
index 05f0aa2cd..7ab52f632 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -226,7 +226,7 @@ msgstr "MI a tennivaló amennyiben a Tor hálózat 
blokkolva van"
 
 #: circumvention.page:10
 msgid "Circumvention"
-msgstr ""
+msgstr "Megkerülés"
 
 #: circumvention.page:12
 msgid ""
@@ -271,6 +271,8 @@ msgid ""
 "Select “yes” when asked if your Internet Service Provider blocks 
connections"
 " to the Tor network."
 msgstr ""
+"Válaszon \"Igen\"-t amikor azt kérdezik hogy az Ön Internet 
Szolgáltatója "
+"blokkolja e az ön kapcsolatát a Tor hálózathoz."
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to

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


[tor-commits] [tor/release-0.3.2] edit changelog a bit

2017-12-13 Thread nickm
commit 304e2151ac96bad8d5f27c63b070b06683d50665
Author: Nick Mathewson 
Date:   Wed Dec 13 12:17:34 2017 -0500

edit changelog a bit
---
 ChangeLog | 103 ++
 1 file changed, 50 insertions(+), 53 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba0fcc292..084d14896 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,77 +1,74 @@
 Changes in version 0.3.2.7-rc - 2017-12-1?
-  Tor 0.3.2.7-rc fixes various bugs in earlier versions of Tor, including
-  some that could affect reliability or correctness.
+  Tor 0.3.2.7-rc fixes various bugs in earlier versions of Tor,
+  including some that could affect reliability or correctness.
 
-  This is the first release candidate in the 0.3.2 series.  If we find no
-  new bugs or regression here, then the first stable 0.3.2. release will be
-  nearly identical to this.
+  This is the first release candidate in the 0.3.2 series. If we find no
+  new bugs or regression here, then the first stable 0.3.2. release will
+  be nearly identical to this.
 
   o Major bugfixes (circuit prediction):
-- Fix circuit prediction logic so that a client doesn't treat a stream as
-  being "handled" by a circuit if that circuit already has isolation
-  settings on it that might make it incompatible with the stream. This
-  change should make Tor clients more responsive by improving their
-  chances of having a pre-created circuit ready for use when a new client
-  request arrives.  Fixes bug 18859; bugfix on 0.2.3.3-alpha.
+- Fix circuit prediction logic so that a client doesn't treat a port
+  as being "handled" by a circuit if that circuit already has
+  isolation settings on it. This change should make Tor clients more
+  responsive by improving their chances of having a pre-created
+  circuit ready for use when a request arrives. Fixes bug 18859;
+  bugfix on 0.2.3.3-alpha.
 
   o Minor features (logging):
-- Provide better warnings when the getrandom() syscall fails.
-  Closes ticket 24500.
+- Provide better warnings when the getrandom() syscall fails. Closes
+  ticket 24500.
 
   o Minor features (portability):
 - Tor now compiles correctly on arm64 with libseccomp-dev installed.
-  (It doesn't yet work with the sandbox enabled.) Closes ticket 24424.
-
-  o Minor bugfix (KIST scheduler):
-- Downgrade a warning to log info when the monotonic time diff is
-  negative. This can happen on platform not supporting monotonic time. The
-  scheduler recovers from this without any problem. Fixes bug 23696;
-  bugfix on 0.3.2.1-alpha.
+  (It doesn't yet work with the sandbox enabled.) Closes
+  ticket 24424.
 
   o Minor bugfixes (bridge clients, bootstrap):
 - Retry directory downloads when we get our first bridge descriptor
-  during bootstrap or while reconnecting to the network. Keep retrying
-  every time we get a bridge descriptor, until we have a reachable bridge.
-  Fixes bug 24367; bugfix on 0.2.0.3-alpha.
+  during bootstrap or while reconnecting to the network. Keep
+  retrying every time we get a bridge descriptor, until we have a
+  reachable bridge. Fixes part of bug 24367; bugfix on 0.2.0.3-alpha.
 - Stop delaying bridge descriptor fetches when we have cached bridge
   descriptors. Instead, only delay bridge descriptor fetches when we
-  have at least one reachable bridge.
-  Fixes bug 24367; bugfix on 0.2.0.3-alpha.
-- Stop delaying directory fetches when we have cached bridge descriptors.
-  Instead, only delay bridge descriptor fetches when all our bridges are
-  definitely unreachable.
-  Fixes bug 24367; bugfix on 0.2.0.3-alpha.
+  have at least one reachable bridge. Fixes part of bug 24367;
+  bugfix on 0.2.0.3-alpha.
+- Stop delaying directory fetches when we have cached bridge
+  descriptors. Instead, only delay bridge descriptor fetches when
+  all our bridges are definitely unreachable. Fixes part of bug
+  24367; bugfix on 0.2.0.3-alpha.
 
   o Minor bugfixes (compilation):
-- Fix a signed/unsigned comparison warning introduced by our
-  fix to TROVE-2017-009. Fixes bug 24480; bugfix on 0.2.5.16.
+- Fix a signed/unsigned comparison warning introduced by our fix to
+  TROVE-2017-009. Fixes bug 24480; bugfix on 0.2.5.16.
 
   o Minor bugfixes (correctness):
-- Fix several places in our codebase where a C compiler would be likely
-  to eliminate a check, based on assuming that undefined behavior had not
-  happened elsewhere in the code.  These cases are usually a sign of
-  redundant checking, or dubious arithmetic. Found by Georg Koppen using
-  the "STACK" tool from Wang, Zeldovich, Kaashoek, and
-  Solar-Lezama. Fixes bug 24423; bugfix on various Tor versions.
-
-  o Minor bugfixes (hidden service v3):
-- Fix a race between the circuit close and free where the 

[tor-commits] [tor/release-0.3.2] Start on an 0.3.2.7-rc changelog

2017-12-13 Thread nickm
commit 6ff333f627389a267846fcd0a53a5f9603b4ad64
Author: Nick Mathewson 
Date:   Wed Dec 13 12:11:17 2017 -0500

Start on an 0.3.2.7-rc changelog
---
 ChangeLog   | 76 +
 changes/bug18859|  7 -
 changes/bug23603|  7 -
 changes/bug23696|  5 
 changes/bug24367| 13 -
 changes/bug24424|  3 ---
 changes/bug24480|  3 ---
 changes/bug24502|  4 ---
 changes/bug24590|  5 
 changes/stack   |  7 -
 changes/ticket24500 |  3 ---
 11 files changed, 76 insertions(+), 57 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8a672f1f2..ba0fcc292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,79 @@
+Changes in version 0.3.2.7-rc - 2017-12-1?
+  Tor 0.3.2.7-rc fixes various bugs in earlier versions of Tor, including
+  some that could affect reliability or correctness.
+
+  This is the first release candidate in the 0.3.2 series.  If we find no
+  new bugs or regression here, then the first stable 0.3.2. release will be
+  nearly identical to this.
+
+  o Major bugfixes (circuit prediction):
+- Fix circuit prediction logic so that a client doesn't treat a stream as
+  being "handled" by a circuit if that circuit already has isolation
+  settings on it that might make it incompatible with the stream. This
+  change should make Tor clients more responsive by improving their
+  chances of having a pre-created circuit ready for use when a new client
+  request arrives.  Fixes bug 18859; bugfix on 0.2.3.3-alpha.
+
+  o Minor features (logging):
+- Provide better warnings when the getrandom() syscall fails.
+  Closes ticket 24500.
+
+  o Minor features (portability):
+- Tor now compiles correctly on arm64 with libseccomp-dev installed.
+  (It doesn't yet work with the sandbox enabled.) Closes ticket 24424.
+
+  o Minor bugfix (KIST scheduler):
+- Downgrade a warning to log info when the monotonic time diff is
+  negative. This can happen on platform not supporting monotonic time. The
+  scheduler recovers from this without any problem. Fixes bug 23696;
+  bugfix on 0.3.2.1-alpha.
+
+  o Minor bugfixes (bridge clients, bootstrap):
+- Retry directory downloads when we get our first bridge descriptor
+  during bootstrap or while reconnecting to the network. Keep retrying
+  every time we get a bridge descriptor, until we have a reachable bridge.
+  Fixes bug 24367; bugfix on 0.2.0.3-alpha.
+- Stop delaying bridge descriptor fetches when we have cached bridge
+  descriptors. Instead, only delay bridge descriptor fetches when we
+  have at least one reachable bridge.
+  Fixes bug 24367; bugfix on 0.2.0.3-alpha.
+- Stop delaying directory fetches when we have cached bridge descriptors.
+  Instead, only delay bridge descriptor fetches when all our bridges are
+  definitely unreachable.
+  Fixes bug 24367; bugfix on 0.2.0.3-alpha.
+
+  o Minor bugfixes (compilation):
+- Fix a signed/unsigned comparison warning introduced by our
+  fix to TROVE-2017-009. Fixes bug 24480; bugfix on 0.2.5.16.
+
+  o Minor bugfixes (correctness):
+- Fix several places in our codebase where a C compiler would be likely
+  to eliminate a check, based on assuming that undefined behavior had not
+  happened elsewhere in the code.  These cases are usually a sign of
+  redundant checking, or dubious arithmetic. Found by Georg Koppen using
+  the "STACK" tool from Wang, Zeldovich, Kaashoek, and
+  Solar-Lezama. Fixes bug 24423; bugfix on various Tor versions.
+
+  o Minor bugfixes (hidden service v3):
+- Fix a race between the circuit close and free where the service would
+  launch a new intro circuit after the close, and then fail to register it
+  before the free of the previously closed circuit. This was making the
+  service unable to find the established intro circuit and thus not upload
+  its descriptor. It can make a service unavailable for up to 24 hours.
+  Fixes bug 23603; bugfix on 0.3.2.1-alpha.
+
+  o Minor bugfixes (scheduler):
+- Properly set the scheduler state of an unopened channel in the KIST
+  scheduler main loop. This prevents a harmless but annoying log warning.
+  Fixes bug 24502; bugfix on 0.3.2.4-alpha.
+
+  o Minor bugfixes (scheduler, KIST):
+- Avoid a possible integer overflow when computing the available space on
+  the TCP buffer of a channel. This has no security implications but can
+  make KIST not behave properly by allowing more cells on a already
+  saturated connection. Fixes bug 24590; bugfix on 0.3.2.1-alpha.
+
+
 Changes in version 0.3.2.6-alpha - 2017-12-01
   This version of Tor is the latest in the 0.3.2 alpha series. It
   includes fixes for several important security issues. All Tor users
diff --git a/changes/bug18859 b/changes/bug18859
deleted file mode 100644
index 

[tor-commits] [tor/master] remove changes files that will appear in 0.3.2.7-rc

2017-12-13 Thread nickm
commit 102b4f3a920368e42fdf34367ee542195619ac2d
Author: Nick Mathewson 
Date:   Wed Dec 13 12:08:52 2017 -0500

remove changes files that will appear in 0.3.2.7-rc
---
 changes/bug18859|  7 ---
 changes/bug23603|  7 ---
 changes/bug23696|  5 -
 changes/bug24367| 13 -
 changes/bug24424|  3 ---
 changes/bug24480|  3 ---
 changes/bug24502|  4 
 changes/bug24590|  5 -
 changes/stack   |  7 ---
 changes/ticket24500 |  3 ---
 10 files changed, 57 deletions(-)

diff --git a/changes/bug18859 b/changes/bug18859
deleted file mode 100644
index 1fe5bc210..0
--- a/changes/bug18859
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Major bugfixes (circuit prediction):
-- Fix circuit prediction logic so that a client doesn't treat a stream as
-  being "handled" by a circuit if that circuit already has isolation
-  settings on it that might make it incompatible with the stream. This
-  change should make Tor clients more responsive by improving their
-  chances of having a pre-created circuit ready for use when a new client
-  request arrives.  Fixes bug 18859; bugfix on 0.2.3.3-alpha.
diff --git a/changes/bug23603 b/changes/bug23603
deleted file mode 100644
index dfb2052c9..0
--- a/changes/bug23603
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (hidden service v3):
-- Fix a race between the circuit close and free where the service would
-  launch a new intro circuit after the close, and then fail to register it
-  before the free of the previously closed circuit. This was making the
-  service unable to find the established intro circuit and thus not upload
-  its descriptor. It can make a service unavailable for up to 24 hours.
-  Fixes bug 23603; bugfix on 0.3.2.1-alpha.
diff --git a/changes/bug23696 b/changes/bug23696
deleted file mode 100644
index c5d18583d..0
--- a/changes/bug23696
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfix (KIST scheduler):
-- Downgrade a warning to log info when the monotonic time diff is
-  negative. This can happen on platform not supporting monotonic time. The
-  scheduler recovers from this without any problem. Fixes bug 23696;
-  bugfix on 0.3.2.1-alpha.
diff --git a/changes/bug24367 b/changes/bug24367
deleted file mode 100644
index 09ef3bb87..0
--- a/changes/bug24367
+++ /dev/null
@@ -1,13 +0,0 @@
-  o Minor bugfixes (bridge clients, bootstrap):
-- Retry directory downloads when we get our first bridge descriptor
-  during bootstrap or while reconnecting to the network. Keep retrying
-  every time we get a bridge descriptor, until we have a reachable bridge.
-  Fixes bug 24367; bugfix on 0.2.0.3-alpha.
-- Stop delaying bridge descriptor fetches when we have cached bridge
-  descriptors. Instead, only delay bridge descriptor fetches when we
-  have at least one reachable bridge.
-  Fixes bug 24367; bugfix on 0.2.0.3-alpha.
-- Stop delaying directory fetches when we have cached bridge descriptors.
-  Instead, only delay bridge descriptor fetches when all our bridges are
-  definitely unreachable.
-  Fixes bug 24367; bugfix on 0.2.0.3-alpha.
diff --git a/changes/bug24424 b/changes/bug24424
deleted file mode 100644
index 63c2d39ba..0
--- a/changes/bug24424
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (portability):
-- Tor now compiles correctly on arm64 with libseccomp-dev installed.
-  (It doesn't yet work with the sandbox enabled.) Closes ticket 24424.
diff --git a/changes/bug24480 b/changes/bug24480
deleted file mode 100644
index 94e5b91a0..0
--- a/changes/bug24480
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (compilation):
-- Fix a signed/unsigned comparison warning introduced by our
-  fix to TROVE-2017-009. Fixes bug 24480; bugfix on 0.2.5.16.
diff --git a/changes/bug24502 b/changes/bug24502
deleted file mode 100644
index 3fa6fb58d..0
--- a/changes/bug24502
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (scheduler):
-- Properly set the scheduler state of an unopened channel in the KIST
-  scheduler main loop. This prevents a harmless but annoying log warning.
-  Fixes bug 24502; bugfix on 0.3.2.4-alpha.
diff --git a/changes/bug24590 b/changes/bug24590
deleted file mode 100644
index 77e039f8d..0
--- a/changes/bug24590
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (scheduler, KIST):
-- Avoid a possible integer overflow when computing the available space on
-  the TCP buffer of a channel. This has no security implications but can
-  make KIST not behave properly by allowing more cells on a already
-  saturated connection. Fixes bug 24590; bugfix on 0.3.2.1-alpha.
diff --git a/changes/stack b/changes/stack
deleted file mode 100644
index ffdf536cb..0
--- a/changes/stack
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (correctness):
-- Fix several places in 

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

2017-12-13 Thread nickm
commit 0834f4d93dc808bc2f01350635719551762fee69
Merge: 4c015d9fe ca8e9813b
Author: Nick Mathewson 
Date:   Wed Dec 13 12:07:46 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 .gitignore | 1 +
 1 file changed, 1 insertion(+)

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


[tor-commits] [tor/master] vim sometimes makes swo tempfiles

2017-12-13 Thread nickm
commit ca8e9813bf125d68d64228d1bb39a170ae6ea16b
Author: Nick Mathewson 
Date:   Wed Dec 13 12:07:45 2017 -0500

vim sometimes makes swo tempfiles
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 671288d41..4dc8867a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .#*
 *~
 *.swp
+*.swo
 # C stuff
 *.o
 *.obj



___
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.3.2'

2017-12-13 Thread nickm
commit 9b714697739f3665c49c84e9a439285c75ad3bbc
Merge: 1fb3d37c0 ca8e9813b
Author: Nick Mathewson 
Date:   Wed Dec 13 12:07:46 2017 -0500

Merge branch 'maint-0.3.2'

 .gitignore | 1 +
 1 file changed, 1 insertion(+)

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


[tor-commits] [tor/release-0.3.2] vim sometimes makes swo tempfiles

2017-12-13 Thread nickm
commit ca8e9813bf125d68d64228d1bb39a170ae6ea16b
Author: Nick Mathewson 
Date:   Wed Dec 13 12:07:45 2017 -0500

vim sometimes makes swo tempfiles
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 671288d41..4dc8867a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .#*
 *~
 *.swp
+*.swo
 # C stuff
 *.o
 *.obj



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


[tor-commits] [tor/maint-0.3.2] vim sometimes makes swo tempfiles

2017-12-13 Thread nickm
commit ca8e9813bf125d68d64228d1bb39a170ae6ea16b
Author: Nick Mathewson 
Date:   Wed Dec 13 12:07:45 2017 -0500

vim sometimes makes swo tempfiles
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 671288d41..4dc8867a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .#*
 *~
 *.swp
+*.swo
 # C stuff
 *.o
 *.obj

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


[tor-commits] [tor/master] update to 0.3.2.7-rc

2017-12-13 Thread nickm
commit 93b3c4b8448914b6f3753829a965603fe15c059c
Author: Nick Mathewson 
Date:   Wed Dec 13 12:06:09 2017 -0500

update to 0.3.2.7-rc
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 086822313..c5163b820 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.2.6-alpha-dev])
+AC_INIT([tor],[0.3.2.7-rc])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 4a4fc51f9..f37b3a8d0 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.2.6-alpha-dev"
+!define VERSION "0.3.2.7-rc"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5bd1f47e5..5fa0c1dd0 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.2.6-alpha-dev"
+#define VERSION "0.3.2.7-rc"
 
 
 



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


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

2017-12-13 Thread nickm
commit 4c015d9fe4abf54f5e3d8929fa62b916789e158f
Merge: 37fba82c1 93b3c4b84
Author: Nick Mathewson 
Date:   Wed Dec 13 12:06:52 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 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 branch 'maint-0.3.2'

2017-12-13 Thread nickm
commit 1fb3d37c08be1c1e9501990d1762c0fbb1f9388d
Merge: 8441189b3 93b3c4b84
Author: Nick Mathewson 
Date:   Wed Dec 13 12:06:43 2017 -0500

Merge branch 'maint-0.3.2'

"ours" merge to avoid version bump.

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


[tor-commits] [tor/release-0.3.2] update to 0.3.2.7-rc

2017-12-13 Thread nickm
commit 93b3c4b8448914b6f3753829a965603fe15c059c
Author: Nick Mathewson 
Date:   Wed Dec 13 12:06:09 2017 -0500

update to 0.3.2.7-rc
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 086822313..c5163b820 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.2.6-alpha-dev])
+AC_INIT([tor],[0.3.2.7-rc])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 4a4fc51f9..f37b3a8d0 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.2.6-alpha-dev"
+!define VERSION "0.3.2.7-rc"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5bd1f47e5..5fa0c1dd0 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.2.6-alpha-dev"
+#define VERSION "0.3.2.7-rc"
 
 
 



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


[tor-commits] [tor/maint-0.3.2] update to 0.3.2.7-rc

2017-12-13 Thread nickm
commit 93b3c4b8448914b6f3753829a965603fe15c059c
Author: Nick Mathewson 
Date:   Wed Dec 13 12:06:09 2017 -0500

update to 0.3.2.7-rc
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 086822313..c5163b820 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.2.6-alpha-dev])
+AC_INIT([tor],[0.3.2.7-rc])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 4a4fc51f9..f37b3a8d0 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.2.6-alpha-dev"
+!define VERSION "0.3.2.7-rc"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5bd1f47e5..5fa0c1dd0 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.2.6-alpha-dev"
+#define VERSION "0.3.2.7-rc"
 
 
 

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


[tor-commits] [metrics-web/master] Update news.json to version 204 of doc/MetricsTimeline.

2017-12-13 Thread karsten
commit 1deb7910bd6422011492431c7cd2711a9065b4d9
Author: Karsten Loesing 
Date:   Wed Dec 13 17:58:24 2017 +0100

Update news.json to version 204 of doc/MetricsTimeline.
---
 website/src/main/resources/etc/news.json | 37 +++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/website/src/main/resources/etc/news.json 
b/website/src/main/resources/etc/news.json
index da3cf9a..410dd9a 100644
--- a/website/src/main/resources/etc/news.json
+++ b/website/src/main/resources/etc/news.json
@@ -1127,6 +1127,16 @@
 ]
   },
   {
+"start": "2015-02-14",
+"protocols": [
+  "meek"
+],
+"description": "Release of Orbot v15-alpha-3, first release with meek.",
+"links": [
+  "https://lists.mayfirst.org/pipermail/guardian-dev/2015-February/004243.html\;>mailing
 list post"
+]
+  },
+  {
 "start": "2015-02-28",
 "protocols": [
   "meek"
@@ -1170,7 +1180,18 @@
 ],
 "description": "Tor Weekly News covers the meek-azure performance 
improvement.",
 "links": [
-  "https://blog.torproject.org/blog/tor-weekly-news-%E2%80%94-april-15th-2015\;>covers
 the meek-azure blog post"
+  "https://blog.torproject.org/blog/tor-weekly-news-%E2%80%94-april-15th-2015\;>blog
 post"
+]
+  },
+  {
+"start": "2015-04-19",
+"protocols": [
+  "meek",
+  "obfs4"
+],
+"description": "Release of Orbot v15 alpha 5, first release with obfs4.",
+"links": [
+  "https://lists.mayfirst.org/pipermail/guardian-dev/2015-March/004283.html\;>mailing
 list post"
 ]
   },
   {
@@ -1523,6 +1544,9 @@
   {
 "start": "2016-01-29",
 "end": "2016-02-02",
+"places": [
+  "cn"
+],
 "protocols": [
   "meek"
 ],
@@ -2841,6 +2865,17 @@
 ]
   },
   {
+"start": "2017-12-05",
+"end": "2017-12-15",
+"places": [
+  "zw"
+],
+"description": "Internet outage in Zimbabwe.",
+"links": [
+  "https://www.techzim.co.zw/2017/12/zimbabwe-internet-outage-here-what-happened/\;>article"
+]
+  },
+  {
 "start": "2016-02-24",
 "places": [
   "tm"

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


[tor-commits] [metrics-web/master] Updates list of services (Fixes: #24414)

2017-12-13 Thread karsten
commit 85f298ea8a04d3625b88eae34f9a71f112fe3e8d
Author: Iain R. Learmonth 
Date:   Sat Dec 2 14:21:06 2017 +

Updates list of services (Fixes: #24414)

Adds:
 * tormap.void.gr
 * OrNetStats

Removes:
 * compass.tpo (retired)
 * OnionView (link no longer useful)
---
 website/src/main/resources/web/WEB-INF/services.jsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/src/main/resources/web/WEB-INF/services.jsp 
b/website/src/main/resources/web/WEB-INF/services.jsp
index 3d4f330..dcd296c 100644
--- a/website/src/main/resources/web/WEB-INF/services.jsp
+++ b/website/src/main/resources/web/WEB-INF/services.jsp
@@ -30,10 +30,10 @@
   The following tools let you explore currently running relays and 
bridges.
   
 https://atlas.torproject.org/;>Relay Search displays 
data about single relays and bridges in the Tor Network.
-https://compass.torproject.org/; 
target="_blank">Compass groups current relays in different ways to measure 
Tor's network diversity.
 https://consensus-health.torproject.org/; 
target="_blank">Consensus Health displays information about the current 
directory consensus and votes.
+https://tormap.void.gr/; target="_blank">Tor Map 
displays an interactive map of Tor relays and provides KML files for relay 
locations.
+https://nusenu.github.io/OrNetStats/; 
target="_blank">OrNetStats displays statistics for monitoring diversity in 
the Tor network.
 https://duckduckgo.com/; target="_blank">DuckDuckGo 
displays Tor node details when including the keywords "tor node" in a 
search.
-https://onionview.codeplex.com/; 
target="_blank">OnionView plots the location of active Tor nodes on an 
interactive map of the world.
 https://onionite.now.sh/; target="_blank">Onionite is 
a Progressive Web App to view information on the individual nodes that make up 
the Tor network.
   
 

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


[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-12-13 Thread translation
commit c8a5ccd39df88a52589dee2b8c7b1555fd3012be
Author: Translation commit bot 
Date:   Wed Dec 13 16:50:38 2017 +

Update translations for tor-browser-manual
---
 hu/hu.po | 36 
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/hu/hu.po b/hu/hu.po
index 9a22c8f50..05f0aa2cd 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -68,6 +68,9 @@ msgid ""
 "In addition, Tor Browser is designed to prevent websites from "
 "“fingerprinting” or identifying you based on your browser configuration."
 msgstr ""
+"Ezen kívül, a Tor böngésző úgy lett kifejlesztve hogy megakadályozza a 
"
+"weblapokat, hogy az alapján azonosítsák Önt, hogy milyen böngésző "
+"beállításokat használ."
 
 #: about-tor-browser.page:39
 msgid ""
@@ -75,6 +78,10 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
+"Alapvetően a Tor Böngésző nem ment semmilyen böngészési előzményt. A 
sütik "
+"csak egy munkafázisig érvényesek(ameddig ki nem lépnek a Tor 
böngészőből, "
+"vagy egy Új "
+"Identitást nem kérnek)."
 
 #: about-tor-browser.page:50
 msgid "How Tor works"
@@ -88,6 +95,11 @@ msgid ""
 " last relay in the circuit (the “exit relay”) then sends the traffic out "
 "onto the public Internet."
 msgstr ""
+"A Tor virtuális csatornák hálózata, aminek segítéségével növelheti 
személes "
+"biztonságát az Interneten. A Tor a hálózati forgalmát keresztül küldi 
három "
+"véletlen módon kiválasztott szerveren (amiket Elosztó-nak 
hívunk) a"
+" Tor hálózatán belül. Az utolsó elosztó(a \"kijárat elosztó\") után 
kerül ki"
+" a forgalom az Internetre"
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -107,10 +119,14 @@ msgid ""
 "three keys represent the layers of encryption between the user and each "
 "relay."
 msgstr ""
+"A fenti kép azt illusztrálja, ahogy egy felhasználó különböző 
oldalakat "
+"böngészik a Tor-on keresztül. A zöld monitorok Elosztókat 
szimbolizálnak a "
+"Tor hálózaton, a három kulcs pedig a titkosítások rétegeit mutatja a "
+"felhasználó, és az egyes Elosztók között."
 
 #: bridges.page:6
 msgid "Learn what bridges are and how to get them"
-msgstr ""
+msgstr "Tudja meg mik azok a hidak és hogyan használhatja őket"
 
 #: bridges.page:10
 msgid "Bridges"
@@ -135,13 +151,15 @@ msgstr ""
 
 #: bridges.page:28
 msgid "Getting bridge addresses"
-msgstr ""
+msgstr "Híd címek megszerzése."
 
 #: bridges.page:29
 msgid ""
 "Because bridge addresses are not public, you will need to request them "
 "yourself. You have two options:"
 msgstr ""
+"MIvel a híd címek nem publikusak ezért, Önnek meg kell valahogyan 
szereznie "
+"őket.Önnek erre két lehetősége van:"
 
 #: bridges.page:36
 msgid ""
@@ -149,22 +167,28 @@ msgid ""
 
"href=\"https://bridges.torproject.org/\;>https://bridges.torproject.org/"
 " and follow the instructions, or"
 msgstr ""
+"Látogassa meghttps://bridges.torproject.org/\;>https://bridges.torproject.org/weblapot"
+" és kövesse az ott szereplő utasításokat, vagy"
 
 #: bridges.page:42
 msgid ""
 "Email brid...@torproject.org from a Gmail, Yahoo, or Riseup email address, "
 "or"
 msgstr ""
+"Küldjön egy Emailt a  brid...@torproject.org címre Gmail, Yahoo, vagy 
Riseup"
+" emailcímrőlí vagy"
 
 #: bridges.page:51
 msgid "Entering bridge addresses"
-msgstr ""
+msgstr "Híd címek bevitele"
 
 #: bridges.page:52
 msgid ""
 "Once you have obtained some bridge addresses, you will need to enter them "
 "into Tor Launcher."
 msgstr ""
+"Ahogyan megszerzett néhány híd címet, be kell ütnie őket a Tor 
indítójába."
 
 #: bridges.page:57
 msgid ""
@@ -172,6 +196,10 @@ msgid ""
 " to the Tor network. Select “Use custom bridges” and enter each bridge "
 "address on a separate line."
 msgstr ""
+"Válasszon \"igen\"-t amikor megkérdezik hogy az Ön Internet 
szolgáltatója "
+"blokkolja-e a kapcsolatokat a Tor hálózatra. Válassza ki az\"Egyedi hidak "
+"használata\" lehetőséget, majd írja be  mindegyik hídnak a címét, "
+"mindegyiket új sorba."
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -194,7 +222,7 @@ msgstr ""
 
 #: circumvention.page:6
 msgid "What to do if the Tor network is blocked"
-msgstr ""
+msgstr "MI a tennivaló amennyiben a Tor hálózat blokkolva van"
 
 #: circumvention.page:10
 msgid "Circumvention"

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


[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-12-13 Thread translation
commit 8a57c86df9c7baaf41f663fd57ecfb76e0f35a7e
Author: Translation commit bot 
Date:   Wed Dec 13 16:20:45 2017 +

Update translations for tor-browser-manual
---
 hu/hu.po | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/hu/hu.po b/hu/hu.po
index 39236fb8e..9a22c8f50 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -4,12 +4,13 @@
 # runasand , 2016
 # Márk Kökény , 2016
 # Falu , 2017
+# Szajkó Levente , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Falu , 2017\n"
+"Last-Translator: Szajkó Levente , 2017\n"
 "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,6 +26,8 @@ msgstr "fordítás készítői"
 #: about-tor-browser.page:7
 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
+"Ismerje meg mit tud a Tor Böngésző tenni annak érdekében , hogy 
megvédje az "
+"Ön személyes adatait,és anonimitását."
 
 #: about-tor-browser.page:10
 msgid "About Tor Browser"
@@ -35,6 +38,8 @@ msgid ""
 "Tor Browser uses the Tor network to protect your privacy and anonymity. "
 "Using the Tor network has two main properties:"
 msgstr ""
+"A Tor Böngésző a Tor hálózatot használja hogy megvédje az ön 
személyes "
+"adatait, és az anonimitását. A Tor hálózat használatának két fő 
célja van: "
 
 #: about-tor-browser.page:18
 msgid ""
@@ -42,6 +47,9 @@ msgid ""
 " will not be able to track your internet activity, including the names and "
 "addresses of the websites you visit."
 msgstr ""
+"Az ön internet szolgáltatója, és bárki más aki figyeli az Ön 
kapcsolatát, "
+"nem fogja tudni követni az Ön internet aktivitását, ebbe beletartozik "
+",azoknak a weblapoknak a neve, és címe amiket meglátogat."
 
 #: about-tor-browser.page:25
 msgid ""
@@ -50,6 +58,10 @@ msgid ""
 "real Internet (IP) address, and will not know who you are unless you "
 "explicitly identify yourself."
 msgstr ""
+"A weblap kezelői és a szolgáltatások amelyeket Ön használ. és bárki 
aki "
+"ezeket megfigyeli, egy a Tor hálózatról jövő kapcsolatot fog látni, az 
ön "
+"igazi Internetcíme(IP) helyett, és nem fogják tudni hogy ki maga, ameddig 
ön"
+" fel nem fedi a kilétét."
 
 #: about-tor-browser.page:34
 msgid ""

___
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

2017-12-13 Thread translation
commit 8dbf57379c7efac240567aa6d66ff2d7a48c5568
Author: Translation commit bot 
Date:   Wed Dec 13 16:16:37 2017 +

Update translations for tor-launcher-properties
---
 hu/torlauncher.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hu/torlauncher.properties b/hu/torlauncher.properties
index 711dbd015..3d675a041 100644
--- a/hu/torlauncher.properties
+++ b/hu/torlauncher.properties
@@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Meg kell adnia egy vagy 
több hidat.
 torlauncher.error_default_bridges_type_missing=Ki kell választanod egy 
átviteli típust a felkínált hidakhoz.
 torlauncher.error_bridge_bad_default_type=Nincs egy híd sem aminek az 
átviteli típusa %S elérhető lenne. Kérlek módosítsd a beállításaidat.
 
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(működik Kínában)
+torlauncher.bridge_suffix.meek-azure=(működik Kínában)
 
 torlauncher.connect=Csatlakozás
 torlauncher.restart_tor=Tor újraindítása

___
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

2017-12-13 Thread translation
commit 78285ee84985c8fefeeefb30978cebdcd9d5d81d
Author: Translation commit bot 
Date:   Wed Dec 13 16:16:59 2017 +

Update translations for tor-launcher-network-settings
---
 hu/network-settings.dtd | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/hu/network-settings.dtd b/hu/network-settings.dtd
index 7a5475783..7e16f4099 100644
--- a/hu/network-settings.dtd
+++ b/hu/network-settings.dtd
@@ -1,7 +1,7 @@
 
-
-
-
+
+
+
 
 
 
@@ -9,8 +9,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -25,9 +25,9 @@
 
 
 
-
+
 
-
+
 
 
 
@@ -47,7 +47,7 @@
 
 
 
-
+
 
 
 
@@ -55,4 +55,4 @@
 
 
 
-
+

___
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_completed] Update translations for tor-launcher-properties_completed

2017-12-13 Thread translation
commit 70d8377c234c6c9bfba8ae7e16d6f5c532c0f79a
Author: Translation commit bot 
Date:   Wed Dec 13 16:16:43 2017 +

Update translations for tor-launcher-properties_completed
---
 hu/torlauncher.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hu/torlauncher.properties b/hu/torlauncher.properties
index 4bc462777..3d675a041 100644
--- a/hu/torlauncher.properties
+++ b/hu/torlauncher.properties
@@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Meg kell adnia egy vagy 
több hidat.
 torlauncher.error_default_bridges_type_missing=Ki kell választanod egy 
átviteli típust a felkínált hidakhoz.
 torlauncher.error_bridge_bad_default_type=Nincs egy híd sem aminek az 
átviteli típusa %S elérhető lenne. Kérlek módosítsd a beállításaidat.
 
-torlauncher.recommended_bridge=(ajánlott)
+torlauncher.bridge_suffix.meek-amazon=(működik Kínában)
+torlauncher.bridge_suffix.meek-azure=(működik Kínában)
 
 torlauncher.connect=Csatlakozás
 torlauncher.restart_tor=Tor újraindítása

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


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

2017-12-13 Thread translation
commit f5e13f741de881fe016f3ec3351c3240f6f4c01d
Author: Translation commit bot 
Date:   Wed Dec 13 16:15:54 2017 +

Update translations for liveusb-creator
---
 hu/hu.po | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/hu/hu.po b/hu/hu.po
index 19cde6430..80d8d16f9 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -21,7 +21,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-10 15:57+0100\n"
-"PO-Revision-Date: 2017-12-13 15:45+\n"
+"PO-Revision-Date: 2017-12-13 15:56+\n"
 "Last-Translator: Szajkó Levente \n"
 "Language-Team: Hungarian 
(http://www.transifex.com/otf/torproject/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -221,17 +221,17 @@ msgstr "A %(device)s formázása FAT32-re"
 
 #: ../tails_installer/creator.py:1249
 msgid "Could not find syslinux' gptmbr.bin"
-msgstr ""
+msgstr "Nem található syslinus' gptmbr.bin"
 
 #: ../tails_installer/creator.py:1262
 #, python-format
 msgid "Reading extracted MBR from %s"
-msgstr ""
+msgstr "Kicsomagolt MBR beolvása innen:%s"
 
 #: ../tails_installer/creator.py:1266
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
-msgstr ""
+msgstr "Erről a helyről:%(path)s nem olvasható a kicsomagolt MBR"
 
 #: ../tails_installer/creator.py:1279 ../tails_installer/creator.py:1280
 #, python-format
@@ -284,7 +284,7 @@ msgstr "Nem található"
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
-msgstr ""
+msgstr "Győzödjön meg róla hogy kicsomagolta a teljes tails-telepítő zip 
fájlt mielőtt futtatja ezt a porgramot."
 
 #: ../tails_installer/gui.py:69
 #, python-format
@@ -333,7 +333,7 @@ msgstr "Telepít"
 #: ../tails_installer/gui.py:469
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
-msgstr ""
+msgstr "%(size)s%(vendor)s%(model)seszköz(%(device)s)"
 
 #: ../tails_installer/gui.py:481
 msgid "No ISO image selected"
@@ -350,7 +350,7 @@ msgstr "Nem található olyan eszköz amire a Tails 
telepíthető lenne."
 #: ../tails_installer/gui.py:523
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
-msgstr ""
+msgstr "Csatlakoztasson egy USB meghajtót vagy SD kártyát amin legalább 
ennyi hely van:%0.1fGB"
 
 #: ../tails_installer/gui.py:557
 #, python-format
@@ -358,7 +358,7 @@ msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
 "manufacturer and Tails will fail to start on it. Please try installing on a "
 "different model."
-msgstr ""
+msgstr "Az USB meghajtó \"%(pretty_name)s\" a gyártó álltal 
nem-eltávolítható ezért a Tails nem fog elindulni rajta. Kérem próbálja 
meg a telepítést egy másik modellen."
 
 #: ../tails_installer/gui.py:567
 #, python-format
@@ -393,7 +393,7 @@ msgstr "Nem lehetséges az eszköz csatolása"
 
 #: ../tails_installer/gui.py:705 ../tails_installer/gui.py:735
 msgid "Confirm the target USB stick"
-msgstr ""
+msgstr "Erősítse meg a cél USB meghajtót"
 
 #: ../tails_installer/gui.py:706
 #, python-format
@@ -406,7 +406,7 @@ msgstr "Telepíteni fogod a Tails-t %(size)s %(vendor)s 
%(model)s eszköz (%(dev
 #: ../tails_installer/gui.py:722
 #, python-format
 msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
-msgstr ""
+msgstr "%(parent_size)s%(vendor)s%(model)s eszköz(%(device)s)"
 
 #: ../tails_installer/gui.py:730
 msgid ""
@@ -418,7 +418,7 @@ msgstr ""
 #: ../tails_installer/gui.py:731
 #, python-format
 msgid "%(description)s%(persistence_message)s"
-msgstr ""
+msgstr "%(description)s%(persistence_message)s"
 
 #: ../tails_installer/gui.py:781
 msgid "Download complete!"
@@ -464,7 +464,7 @@ msgid ""
 "There was a problem executing `%s`.\n"
 "%s\n"
 "%s"
-msgstr ""
+msgstr "Probléma lépett fel %s \n%s\n%svégrehajtása közben"
 
 #: ../tails_installer/source.py:63
 #, python-format
@@ -479,7 +479,7 @@ msgstr "%s nem könyvtár."
 #: ../tails_installer/source.py:75
 #, python-format
 msgid "Skipping '%(filename)s'"
-msgstr ""
+msgstr "Kihagyás '%(filename)s'"
 
 #: ../tails_installer/utils.py:44
 #, python-format
@@ -510,7 +510,7 @@ msgstr "Válassza ki a letöltendő disztribúciót:"
 
 #: ../data/tails-installer.ui.h:5
 msgid "Target USB stick:"
-msgstr ""
+msgstr "A cél USB meghajtó:"
 
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"

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


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

2017-12-13 Thread translation
commit c61c1939b0853b29003d2e91a03057725112d951
Author: Translation commit bot 
Date:   Wed Dec 13 15:45:55 2017 +

Update translations for liveusb-creator
---
 hu/hu.po | 35 ++-
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/hu/hu.po b/hu/hu.po
index 07302d1e8..19cde6430 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -13,6 +13,7 @@
 # Lajos Pasztor , 2014
 # PB , 2017
 # Sulyok Péter , 2009
+# Szajkó Levente , 2017
 # vargaviktor , 2013
 # vargaviktor , 2012
 msgid ""
@@ -20,8 +21,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-10 15:57+0100\n"
-"PO-Revision-Date: 2017-11-11 03:09+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2017-12-13 15:45+\n"
+"Last-Translator: Szajkó Levente \n"
 "Language-Team: Hungarian 
(http://www.transifex.com/otf/torproject/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -136,7 +137,7 @@ msgstr "Nem támogatott fájlrendszer: %s"
 #: ../tails_installer/creator.py:782
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
-msgstr ""
+msgstr "Ismeretlen GLib kívétel az eszköz csatlakoztatásakor:%(message)s"
 
 #: ../tails_installer/creator.py:786
 #, python-format
@@ -336,15 +337,15 @@ msgstr ""
 
 #: ../tails_installer/gui.py:481
 msgid "No ISO image selected"
-msgstr ""
+msgstr "Nincs kiválasztva ISO fájl"
 
 #: ../tails_installer/gui.py:482
 msgid "Please select a Tails ISO image."
-msgstr ""
+msgstr "Kérlek válassz ki egy Tails ISO fájlt."
 
 #: ../tails_installer/gui.py:521
 msgid "No device suitable to install Tails could be found"
-msgstr ""
+msgstr "Nem található olyan eszköz amire a Tails telepíthető lenne."
 
 #: ../tails_installer/gui.py:523
 #, python-format
@@ -368,7 +369,7 @@ msgstr "A'z' \"%(pretty_name)s\" eszköz túl kicsi a Tails 
telepítéséhez (le
 
 #: ../tails_installer/gui.py:589
 msgid "An error happened while installing Tails"
-msgstr ""
+msgstr "Hiba történt a Tails telepítése közben"
 
 #: ../tails_installer/gui.py:601
 msgid "Refreshing releases..."
@@ -384,7 +385,7 @@ msgstr "Telepítés kész!"
 
 #: ../tails_installer/gui.py:649
 msgid "Installation was completed."
-msgstr ""
+msgstr "Telepítés kész!"
 
 #: ../tails_installer/gui.py:698
 msgid "Unable to mount device"
@@ -400,7 +401,7 @@ msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
 "\n"
 "All data on this USB stick will be lost."
-msgstr ""
+msgstr "Telepíteni fogod a Tails-t %(size)s %(vendor)s %(model)s eszköz 
(%(device)s). Minden adat a választott eszközön törlődni fog. Folytatod?"
 
 #: ../tails_installer/gui.py:722
 #, python-format
@@ -450,7 +451,7 @@ msgstr "%(filename)s kiválasztva"
 
 #: ../tails_installer/source.py:28
 msgid "Unable to find LiveOS on ISO"
-msgstr ""
+msgstr "Nem található LiveOS ezen az ISO-n"
 
 #: ../tails_installer/source.py:34
 #, python-format
@@ -468,12 +469,12 @@ msgstr ""
 #: ../tails_installer/source.py:63
 #, python-format
 msgid "'%s' does not exist"
-msgstr ""
+msgstr "\"%s\" nem létezik!"
 
 #: ../tails_installer/source.py:65
 #, python-format
 msgid "'%s' is not a directory"
-msgstr ""
+msgstr "%s nem könyvtár."
 
 #: ../tails_installer/source.py:75
 #, python-format
@@ -485,7 +486,7 @@ msgstr ""
 msgid ""
 "There was a problem executing `%s`.%s\n"
 "%s"
-msgstr ""
+msgstr "Probléma lépett fel %s%s%svégrehajtása közben"
 
 #: ../tails_installer/utils.py:124
 msgid "Could not open device for writing."
@@ -493,15 +494,15 @@ msgstr ""
 
 #: ../data/tails-installer.ui.h:1
 msgid "Installation Instructions"
-msgstr ""
+msgstr "Telepítési instrukciók"
 
 #: ../data/tails-installer.ui.h:2
 msgid "Clone the current Tails"
-msgstr ""
+msgstr "A Tails klónozása"
 
 #: ../data/tails-installer.ui.h:3
 msgid "Use a downloaded Tails ISO image"
-msgstr ""
+msgstr "Egy letöltött Tails ISO használata."
 
 #: ../data/tails-installer.ui.h:4
 msgid "Select a distribution to download:"
@@ -513,4 +514,4 @@ msgstr ""
 
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
-msgstr ""
+msgstr "Újratelepítés (összes adat törlése)"

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


[tor-commits] [webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into faq-hrefs-for-anchors

2017-12-13 Thread hiro
commit 99f445f943b9abec3677b5af9931c629657a55a8
Merge: f87eea1a 53990269
Author: hiromipaw 
Date:   Wed Dec 13 16:16:38 2017 +0100

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml 
into faq-hrefs-for-anchors

 .gitignore |   4 +-
 Makefile.common|   2 +-
 about/en/corepeople.wml| 157 ++---
 css/layout-rtl.css |   2 +-
 css/layout.css |  52 -
 css/layout.min.css |   2 +-
 css/master.css |   1 +
 download/es/download-easy.wml  | 286 
 download/es/download-unix.wml  | 168 ++
 download/es/download.wml   | 341 +
 images/people/amoghbl1.png | Bin 0 -> 11879 bytes
 include/dlhead.wmi |  40 +++-
 include/foot.wmi   |  52 +
 include/lang.wmi   |   2 +-
 include/navigation.wmi |   1 +
 include/versions.wmi   |  13 +-
 projects/torbrowser/RecommendedTBBVersions |  16 +-
 17 files changed, 989 insertions(+), 150 deletions(-)

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


[tor-commits] [webwml/master] Add hrefs to the heading anchors in the answers. (#24519)

2017-12-13 Thread hiro
commit f87eea1a1a9f45bb15db61e6c970765d0784f235
Author: kat 
Date:   Mon Dec 11 14:12:42 2017 -0500

Add hrefs to the heading anchors in the answers. (#24519)
---
 docs/en/faq.wml | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/en/faq.wml b/docs/en/faq.wml
index d8d4c942..ea52015e 100644
--- a/docs/en/faq.wml
+++ b/docs/en/faq.wml
@@ -287,7 +287,7 @@ things?
 
 
 
-General:
+General:
 
 
 What is Tor?
@@ -889,7 +889,7 @@ executive
 
 
 
-Compilation And Installation:
+Compilation And 
Installation:
 
 
 How do I uninstall
@@ -1025,7 +1025,7 @@ bundle that includes Tor?
 
 
 
-Tor Browser (general):
+Tor Browser (general):
 
 
 Why can't I view videos on
@@ -1380,7 +1380,7 @@ 
href="http://www.crowdstrike.com/community-tools/index.html#tool-79;>proposed
 
 
 
-Tor Browser (3.x and later):
+Tor Browser (3.x and later):
 
 Where did the world map
 (Vidalia) go?
@@ -1510,7 +1510,7 @@ 
href="http://www.crowdstrike.com/community-tools/index.html#tool-79;>proposed
 
 
 
-Advanced Tor usage:
+Advanced Tor usage:
 
 
 I'm supposed to "edit my torrc".
@@ -2016,7 +2016,7 @@ from the source code release tor-0.2.4.16-rc is:
 
 
 
-Running a Tor relay:
+Running a Tor 
relay:
 
 
 How do I decide if I should
@@ -3000,7 +3000,7 @@ diversity,
 
 # Leaving in old ids to accomodate incoming links.
 
-Tor onion services:
+Tor onion services:
 
 
 How do I access
@@ -3066,7 +3066,7 @@ diversity,
 
 
 
-Development:
+Development:
 
 
 What do these weird
@@ -3245,7 +3245,7 @@ diversity,
 
 
 
-Anonymity And Security:
+Anonymity And 
Security:
 
 
 What
@@ -3777,7 +3777,7 @@ Perhaps even run separate Tor clients for these 
applications.
 
 
 
-Alternate designs:
+Alternate designs:
 
 
 You should make every
@@ -4251,7 +4251,7 @@ only solution is to have no opinion.
 
 
 
-Abuse:
+Abuse:
 
 
 Doesn't Tor enable criminals



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


[tor-commits] [tor/master] Changes file for 24374, merged earlier.

2017-12-13 Thread nickm
commit 8441189b3caee2e4cf58a8b2c080b25a3a9b0cfc
Author: Nick Mathewson 
Date:   Wed Dec 13 09:50:53 2017 -0500

Changes file for 24374, merged earlier.
---
 changes/bug24374 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/bug24374 b/changes/bug24374
new file mode 100644
index 0..d0b07f12d
--- /dev/null
+++ b/changes/bug24374
@@ -0,0 +1,4 @@
+  o Minor features (performance, 32-bit):
+- Improve performance on 32-bit systems by avoiding 64-bit division
+  when timestamping cells and buffer chunks for OOM calculations.
+  Implements ticket 24374.

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


[tor-commits] [atlas/master] Bump cache breaker

2017-12-13 Thread irl
commit 837aea5f0c1c00b8ea3b55c2c8fc26856f19a00f
Author: Iain R. Learmonth 
Date:   Wed Dec 13 14:36:54 2017 +

Bump cache breaker
---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 6c9bcdd..1e08772 100644
--- a/index.html
+++ b/index.html
@@ -41,7 +41,7 @@
   https://metrics.torproject.org/js/script.js";>
 
   
-  
+  
 
 
 
@@ -167,7 +167,7 @@ $('.cookie-message').cookieBar({ closeButton: '.cbc' });
 
 
   var require = {
-urlArgs: "v15"
+urlArgs: "v16"
   };
 
 

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


[tor-commits] [atlas/master] Revert "Escape contact information before display in template"

2017-12-13 Thread irl
commit 71c4518b2e654e98d5050b5ee97d64d0beafa554
Author: Iain R. Learmonth 
Date:   Wed Dec 13 14:36:27 2017 +

Revert "Escape contact information before display in template"

This reverts commit 37a65a761afa5a62630c620ac00f42a228604df7.
---
 templates/details/router.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/details/router.html b/templates/details/router.html
index c9f79d5..2aea6b2 100644
--- a/templates/details/router.html
+++ b/templates/details/router.html
@@ -24,7 +24,7 @@
   <%= relay.get('or_addresses') %>
 
   Contact
-  <%= _.escape( relay.get('contact')!='undefined' ? 
_.escape(relay.get('contact')) : 'none' ) %>
+  <%= _.escape( relay.get('contact')!='undefined' ? 
relay.get('contact') : 'none' ) %>
 
   Dir Address
   <%= relay.get('dir_address') ? relay.get('dir_address') : 'none' 
%>



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


[tor-commits] [atlas/master] Bump cache breaker

2017-12-13 Thread irl
commit f9957b78946ee586931e597588a786fac7c181cf
Author: Iain R. Learmonth 
Date:   Wed Dec 13 14:30:28 2017 +

Bump cache breaker
---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 22d8491..6c9bcdd 100644
--- a/index.html
+++ b/index.html
@@ -41,7 +41,7 @@
   https://metrics.torproject.org/js/script.js";>
 
   
-  
+  
 
 
 
@@ -167,7 +167,7 @@ $('.cookie-message').cookieBar({ closeButton: '.cbc' });
 
 
   var require = {
-urlArgs: "v14"
+urlArgs: "v15"
   };
 
 

___
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-52.5.2esr-7.5-2] Bug 24398: Plugin-container process exhausts memory

2017-12-13 Thread gk
commit cef2fe28a238d7e445d7c5b4292bfe27c1b71bca
Author: Georg Koppen 
Date:   Wed Dec 13 14:15:57 2017 +

Bug 24398: Plugin-container process exhausts memory

The plugin-container process can thrash/crash due to increasing memory
consumption after our workaround for bug 24052. The patch provided by a
cypherpunk (bug thanks!) deals with that as far as the Developer Tools
are concerned.
---
 devtools/shared/DevToolsUtils.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/devtools/shared/DevToolsUtils.js b/devtools/shared/DevToolsUtils.js
index d44184fd6b8e..926420154fe5 100644
--- a/devtools/shared/DevToolsUtils.js
+++ b/devtools/shared/DevToolsUtils.js
@@ -559,7 +559,8 @@ function newChannelForURL(url, { policy, window, principal 
}) {
 
   try {
 return NetUtil.newChannel(channelOptions);
-  } catch (e) {
+  } catch (e if e.name === "NS_ERROR_UNKNOWN_PROTOCOL" &&
+!(url.startsWith("file://"))) {
 // In xpcshell tests on Windows, nsExternalProtocolHandler::NewChannel()
 // can throw NS_ERROR_UNKNOWN_PROTOCOL if the external protocol isn't
 // supported by Windows, so we also need to handle the exception here if

___
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

2017-12-13 Thread translation
commit 77b95615e68ecef53d3710a1e9467edb44813e25
Author: Translation commit bot 
Date:   Wed Dec 13 14:15:39 2017 +

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

diff --git a/hu/https-everywhere.dtd b/hu/https-everywhere.dtd
index 591bb6ff6..30d84bd08 100644
--- a/hu/https-everywhere.dtd
+++ b/hu/https-everywhere.dtd
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 

___
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-52.5.2esr-7.5-2] Bug 23104: Add a default line height compensation

2017-12-13 Thread gk
commit 89d8bc54cfe6a4cd999ab1f16f434c4fb809b643
Author: Igor Oliveira 
Date:   Sun Dec 10 18:16:59 2017 -0200

Bug 23104: Add a default line height compensation

Many fonts have issues with their vertical metrics. they
are used to influence the height of ascenders and depth
of descenders. Gecko uses it to calculate the line height
(font height + ascender + descender), however because of
that idiosyncratic behavior across multiple operating
systems, it can be used to identify the user's OS.

The solution proposed in the patch uses a default factor
to be multiplied with the font size, simulating the concept
of ascender and descender. This way all operating
systems will have the same line height only and only if the
frame is outside the chrome.
---
 layout/generic/ReflowInput.cpp   | 16 +
 tbb-tests/mochitest.ini  |  1 +
 tbb-tests/test_tor_bug23104.html | 51 
 3 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/layout/generic/ReflowInput.cpp b/layout/generic/ReflowInput.cpp
index 42f4a24b5314..cda602c50431 100644
--- a/layout/generic/ReflowInput.cpp
+++ b/layout/generic/ReflowInput.cpp
@@ -30,6 +30,7 @@
 #include "CounterStyleManager.h"
 #include 
 #include "mozilla/dom/HTMLInputElement.h"
+#include "nsContentUtils.h"
 
 #ifdef DEBUG
 #undef NOISY_VERTICAL_ALIGN
@@ -2759,7 +2760,7 @@ ReflowInput::CalculateBlockSideMargins(nsIAtom* 
aFrameType)
 // For risk management, we use preference to control the behavior, and 
 // eNoExternalLeading is the old behavior.
 static nscoord
-GetNormalLineHeight(nsFontMetrics* aFontMetrics)
+GetNormalLineHeight(nsIContent* aContent, nsFontMetrics* aFontMetrics)
 {
   NS_PRECONDITION(nullptr != aFontMetrics, "no font metrics");
 
@@ -2768,6 +2769,12 @@ GetNormalLineHeight(nsFontMetrics* aFontMetrics)
   nscoord externalLeading = aFontMetrics->ExternalLeading();
   nscoord internalLeading = aFontMetrics->InternalLeading();
   nscoord emHeight = aFontMetrics->EmHeight();
+
+  if (nsContentUtils::ShouldResistFingerprinting() &&
+  !aContent->IsInChromeDocument()) {
+return NSToCoordRound(emHeight * NORMAL_LINE_HEIGHT_FACTOR);
+  }
+
   switch (GetNormalLineHeightCalcControl()) {
   case eIncludeExternalLeading:
 normalLineHeight = emHeight+ internalLeading + externalLeading;
@@ -2786,7 +2793,8 @@ GetNormalLineHeight(nsFontMetrics* aFontMetrics)
 }
 
 static inline nscoord
-ComputeLineHeight(nsStyleContext* aStyleContext,
+ComputeLineHeight(nsIContent* aContent,
+  nsStyleContext* aStyleContext,
   nscoord aBlockBSize,
   float aFontSizeInflation)
 {
@@ -2821,7 +2829,7 @@ ComputeLineHeight(nsStyleContext* aStyleContext,
 
   RefPtr fm = nsLayoutUtils::
 GetFontMetricsForStyleContext(aStyleContext, aFontSizeInflation);
-  return GetNormalLineHeight(fm);
+  return GetNormalLineHeight(aContent, fm);
 }
 
 nscoord
@@ -2844,7 +2852,7 @@ ReflowInput::CalcLineHeight(nsIContent* aContent,
   NS_PRECONDITION(aStyleContext, "Must have a style context");
 
   nscoord lineHeight =
-ComputeLineHeight(aStyleContext, aBlockBSize, aFontSizeInflation);
+ComputeLineHeight(aContent, aStyleContext, aBlockBSize, 
aFontSizeInflation);
 
   NS_ASSERTION(lineHeight >= 0, "ComputeLineHeight screwed up");
 
diff --git a/tbb-tests/mochitest.ini b/tbb-tests/mochitest.ini
index 3d2e7c9db803..fca972a51211 100644
--- a/tbb-tests/mochitest.ini
+++ b/tbb-tests/mochitest.ini
@@ -10,3 +10,4 @@ support-files =
 [test_tor_bug2875.html]
 [test_tor_bug4755.html]
 [test_tor_bug5856.html]
+[test_tor_bug23104.html]
diff --git a/tbb-tests/test_tor_bug23104.html b/tbb-tests/test_tor_bug23104.html
new file mode 100644
index ..ae73a3446037
--- /dev/null
+++ b/tbb-tests/test_tor_bug23104.html
@@ -0,0 +1,51 @@
+
+
+
+
+  Test for Tor Bug #23104: CSS line-height reveals the platform Tor 
browser is running
+  
+  
+  
+span {
+  background-color: #000;
+  color: #fff;
+  font-size: 16.5px;
+}
+  
+
+
+Test1
+كلمة
+ação
+
+
+let setPref = function* (key, value) {
+  return new Promise(function(resolve, reject) {
+SpecialPowers.pushPrefEnv({"set": [[key, value]]}, resolve);
+  });
+}
+
+function getStyle(el, styleprop) {
+  el = document.getElementById(el);
+  return document.defaultView.getComputedStyle(el, 
null).getPropertyValue(styleprop);
+}
+
+function validateElement(elementName, isFingerprintResistent) {
+  var fontSize = getStyle(elementName, 'font-size');
+  var lineHeight = getStyle(elementName, 'line-height');
+  var validationCb = isFingerprintResistent ? is : isnot;
+  validationCb(parseFloat(lineHeight), parseFloat(fontSize) * 1.2, 'Line 
Height validation');
+}
+
+add_task(function* () {
+  for (let resistFingerprintingValue of [true, false]) {
+  yield setPref("privacy.resistFingerprinting", resistFingerprintingValue);
+for (let elementId of 

[tor-commits] [tor-browser-build/master] Update OpenSSL to 1.0.2n

2017-12-13 Thread gk
commit 813aefd174f31ddbbc473be64aa66f7fbc08e301
Author: Georg Koppen 
Date:   Wed Dec 13 11:47:14 2017 +

Update OpenSSL to 1.0.2n
---
 projects/openssl/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/openssl/config b/projects/openssl/config
index 8c6ccbf..378ee53 100644
--- a/projects/openssl/config
+++ b/projects/openssl/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.0.2l
+version: 1.0.2n
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %].tar.gz'
 
 var:
@@ -25,4 +25,4 @@ input_files:
   - name: '[% c("var/compiler") %]'
 project: '[% c("var/compiler") %]'
   - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz'
-sha256sum: ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c
+sha256sum: 370babb75f278c39e0c50e8c4e7493bc0f18db6867478341a832a982fd15a8fe

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