date:20180511

[tor-commits] [orbot/master] ensure pluggable transports are updated and set to executable

2018-05-11 Thread n8fr8

commit 3bbf7a173849b06036be8dd63bb01655e7555055
Author: n8fr8 
Date:   Sat May 12 00:32:27 2018 -0400

ensure pluggable transports are updated and set to executable
---
 .../service/util/OtherResourceInstaller.java   | 24 +++---
 1 file changed, 12 insertions(+), 12 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 9584e9b0..672d6411 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
@@ -65,27 +65,27 @@ public class OtherResourceInstaller implements 
TorServiceConstants {
 public boolean installResources () throws IOException, 
FileNotFoundException, TimeoutException
 {
 
-InputStream is;
 File outFile;
 
-String cpuPath = "armeabi";
-
-if (Build.CPU_ABI.contains("x86"))
-cpuPath = "x86";
-
 if (!installFolder.exists())
 installFolder.mkdirs();
 
- //   is = context.getAssets().open(cpuPath + '/' + OBFSCLIENT_ASSET_KEY + 
MP3_EXT);
-is = new FileInputStream(new 
File(getNativeLibraryDir(context),OBFSCLIENT_ASSET_KEY + ".so"));
+File libBinary = new 
File(getNativeLibraryDir(context),OBFSCLIENT_ASSET_KEY + ".so");
 outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY);
-streamToFile(is,outFile, false, true);
+
+if ((!outFile.exists()) || (libBinary.lastModified() > 
outFile.lastModified())) {
+streamToFile(new FileInputStream(libBinary), outFile, false, true);
+}
+
 setExecutable(outFile);
 
-//is = context.getAssets().open(cpuPath + '/' + PDNSD_ASSET_KEY + 
MP3_EXT);
-is = new FileInputStream(new 
File(getNativeLibraryDir(context),PDNSD_ASSET_KEY + ".so"));
+libBinary = new File(getNativeLibraryDir(context),PDNSD_ASSET_KEY + 
".so");
 outFile = new File(installFolder, PDNSD_ASSET_KEY);
-streamToFile(is,outFile, false, true);
+
+if ((!outFile.exists()) || (libBinary.lastModified() > 
outFile.lastModified())) {
+streamToFile(new FileInputStream(libBinary), outFile, false, true);
+}
+
 setExecutable(outFile);
 
 



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

[tor-commits] [orbot/master] add NEWNYM feature back into main app screen

2018-05-11 Thread n8fr8

commit 8ebd53835ac9381e82e7aa6d4066d3cccad6fcbd
Author: n8fr8 
Date:   Fri May 11 23:02:22 2018 -0400

add NEWNYM feature back into main app screen
---
 .../org/torproject/android/OrbotMainActivity.java  | 26 --
 app/src/main/res/menu/orbot_main.xml   | 10 -
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index c8a329c3..6fc5c456 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -25,6 +25,7 @@ import org.torproject.android.service.util.TorServiceUtils;
 import org.torproject.android.settings.LocaleHelper;
 import org.torproject.android.settings.SettingsPreferences;
 import org.torproject.android.ui.AppManagerActivity;
+import org.torproject.android.ui.Rotate3dAnimation;
 import org.torproject.android.ui.onboarding.BridgeWizardActivity;
 import org.torproject.android.ui.onboarding.OnboardingActivity;
 import org.torproject.android.ui.hiddenservices.ClientCookiesActivity;
@@ -75,6 +76,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnLongClickListener;
+import android.view.animation.AccelerateInterpolator;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
@@ -432,8 +434,12 @@ public class OrbotMainActivity extends AppCompatActivity
 
 @Override
public boolean onOptionsItemSelected(MenuItem item) {
-   
-if (item.getItemId() == R.id.menu_settings)
+
+if (item.getItemId() == R.id.menu_newnym)
+{
+requestNewTorIdentity();
+}
+else if (item.getItemId() == R.id.menu_settings)
  {
  Intent intent = new Intent(OrbotMainActivity.this, 
SettingsPreferences.class);
  startActivityForResult(intent, REQUEST_SETTINGS);
@@ -1316,6 +1322,22 @@ public class OrbotMainActivity extends AppCompatActivity
 
 }**/
 
+private static final float ROTATE_FROM = 0.0f;
+private static final float ROTATE_TO = 360.0f*4f;// 3.141592654f * 32.0f;
+
+private void requestNewTorIdentity ()
+{
+sendIntentToService (TorServiceConstants.CMD_NEWNYM);
+
+Rotate3dAnimation rotation = new Rotate3dAnimation(ROTATE_FROM, 
ROTATE_TO, imgStatus.getWidth()/2f,imgStatus.getWidth()/2f,20f,false);
+rotation.setFillAfter(true);
+rotation.setInterpolator(new AccelerateInterpolator());
+rotation.setDuration((long) 2*1000);
+rotation.setRepeatCount(0);
+imgStatus.startAnimation(rotation);
+lblStatus.setText(getString(R.string.newnym));
+}
+
 private void addAppShortcuts ()
 {
 LinearLayout llBoxShortcuts = 
(LinearLayout)findViewById(R.id.boxAppShortcuts);
diff --git a/app/src/main/res/menu/orbot_main.xml 
b/app/src/main/res/menu/orbot_main.xml
index deed1a61..f965514c 100644
--- a/app/src/main/res/menu/orbot_main.xml
+++ b/app/src/main/res/menu/orbot_main.xml
@@ -21,7 +21,15 @@
 xmlns:yourapp="http://schemas.android.com/apk/res-auto;
 >
 
- 
+
+
+https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] add more releae build crunching compression

2018-05-11 Thread n8fr8

commit 265caa8d3739e31c14e769c1135016ad580e3b87
Author: n8fr8 
Date:   Wed May 9 13:47:04 2018 -0400

add more releae build crunching compression
---
 app/build.gradle | 5 +
 1 file changed, 5 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index da6d9ff8..3c106337 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,10 +17,15 @@ android {
 buildTypes {
 release {
 minifyEnabled true
+shrinkResources true
 proguardFiles getDefaultProguardFile('proguard-android.txt'), 
'proguard-rules.txt'
 }
 }
 
+aaptOptions {
+cruncherEnabled = false
+}
+
 flavorDimensions "free"
 
 productFlavors {



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

[tor-commits] [orbot/master] update to build 16020011 16.0.2-BETA-1

2018-05-11 Thread n8fr8

commit 0b74afbee745502d9766285a2ffdf9fb52c80197
Author: n8fr8 
Date:   Sat May 12 00:49:14 2018 -0400

update to build 16020011 16.0.2-BETA-1
with tor 0.3.3.5-rc
---
 app/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9e55cdde..1b23a441 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ android {
 buildToolsVersion '27.0.3'
 defaultConfig {
 applicationId "org.torproject.android"
-minSdkVersion 14
+minSdkVersion 16
 targetSdkVersion 27
 }
 lintOptions {
@@ -44,8 +44,8 @@ android {
 minSdkVersion 16
 applicationId 'org.torproject.android'
 targetSdkVersion 27
-versionCode 16010011
-versionName '16.0.1-BETA-1'
+versionCode 16020011
+versionName '16.0.2-BETA-1'
 }
 }
 

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

[tor-commits] [orbot/master] handle phantom selection of country exit

2018-05-11 Thread n8fr8

commit af1d9337586e218c7791fc4e9a26fd64ab0891cd
Author: n8fr8 
Date:   Fri May 11 23:24:21 2018 -0400

handle phantom selection of country exit
- also support custom exit override issue
---
 .../org/torproject/android/OrbotMainActivity.java  | 118 +
 1 file changed, 71 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 6fc5c456..e3fd1a40 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -360,57 +360,79 @@ public class OrbotMainActivity extends AppCompatActivity

});
 
-   String currentExit = Prefs.getExitNodes();
-   int selIdx = -1;
-   
-   ArrayList cList = new ArrayList();
-   cList.add(0, getString(R.string.vpn_default_world));
-   
-   for (int i = 0; i < TorServiceConstants.COUNTRY_CODES.length; 
i++)
-   {
-   Locale locale = new 
Locale("",TorServiceConstants.COUNTRY_CODES[i]);
-   cList.add(locale.getDisplayCountry());
-   
-   if 
(currentExit.contains(TorServiceConstants.COUNTRY_CODES[i]))
-   selIdx = i+1;
-   }
-   
-   spnCountries = (Spinner)findViewById(R.id.spinnerCountry);
-   ArrayAdapter adapter = new 
ArrayAdapter(this,android.R.layout.simple_spinner_item, cList);
-   spnCountries.setAdapter(adapter);
-   
-   if (selIdx != -1)
-   spnCountries.setSelection(selIdx);
-   
-   spnCountries.setOnItemSelectedListener(new 
OnItemSelectedListener() {
-   @Override
-   public void onItemSelected(AdapterView parentView, View 
selectedItemView, int position, long id) {
-   // your code here
-   
-   String country = null;
-   
-   if (position == 0)
-   country = "";
-   else
-   country =  '{' + 
TorServiceConstants.COUNTRY_CODES[position-1] + '}';
-   
-   Intent torService = new Intent(OrbotMainActivity.this, 
TorService.class);
-   
torService.setAction(TorServiceConstants.CMD_SET_EXIT);
-   torService.putExtra("exit",country);
-   startService(torService);
-   
-   }
-
-   @Override
-   public void onNothingSelected(AdapterView parentView) {
-   // your code here
-   }
+spnCountries = (Spinner)findViewById(R.id.spinnerCountry);
+setCountrySpinner();
 
-   });
+mPulsator = (PulsatorLayout) findViewById(R.id.pulsator);
 
+}
 
-mPulsator = (PulsatorLayout) findViewById(R.id.pulsator);
+boolean firstTimeCountrySelect = true;
+
+private void setCountrySpinner ()
+{
+String currentExit = Prefs.getExitNodes();
+if (currentExit.length() > 4)
+{
+//someone put a complex value in, so let's disable
+ArrayList cList = new ArrayList();
+cList.add(0, currentExit);
+ArrayAdapter adapter = new ArrayAdapter(this, 
android.R.layout.simple_spinner_item, cList);
+spnCountries.setAdapter(adapter);
+
+spnCountries.setEnabled(false);
+}
+else {
+int selIdx = -1;
+
+ArrayList cList = new ArrayList();
+cList.add(0, getString(R.string.vpn_default_world));
+
+for (int i = 0; i < TorServiceConstants.COUNTRY_CODES.length; i++) 
{
+Locale locale = new Locale("", 
TorServiceConstants.COUNTRY_CODES[i]);
+cList.add(locale.getDisplayCountry());
 
+if (currentExit.contains(TorServiceConstants.COUNTRY_CODES[i]))
+selIdx = i + 1;
+}
+
+ArrayAdapter adapter = new ArrayAdapter(this, 
android.R.layout.simple_spinner_item, cList);
+spnCountries.setAdapter(adapter);
+
+if (selIdx > 0)
+spnCountries.setSelection(selIdx,true);
+
+spnCountries.setOnItemSelectedListener(new 
OnItemSelectedListener() {
+@Override
+public void onItemSelected(AdapterView parentView, View 
selectedItemView, int position, long id) {
+// your code here
+
+if (firstTimeCountrySelect) {
+firstTimeCountrySelect = false;
+return;

[tor-commits] [orbot/master] fix country selector spinner bug with phantom selections

2018-05-11 Thread n8fr8

commit f702a0e462a79774405ac8bee55cdcf82d32772d
Author: n8fr8 
Date:   Sat May 12 00:39:16 2018 -0400

fix country selector spinner bug with phantom selections
---
 .../main/java/org/torproject/android/OrbotMainActivity.java   | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index e3fd1a40..4e50dd53 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -367,8 +367,6 @@ public class OrbotMainActivity extends AppCompatActivity
 
 }
 
-boolean firstTimeCountrySelect = true;
-
 private void setCountrySpinner ()
 {
 String currentExit = Prefs.getExitNodes();
@@ -403,14 +401,17 @@ public class OrbotMainActivity extends AppCompatActivity
 spnCountries.setSelection(selIdx,true);
 
 spnCountries.setOnItemSelectedListener(new 
OnItemSelectedListener() {
+
+int mOldPosition = spnCountries.getSelectedItemPosition();
+
 @Override
 public void onItemSelected(AdapterView parentView, View 
selectedItemView, int position, long id) {
 // your code here
 
-if (firstTimeCountrySelect) {
-firstTimeCountrySelect = false;
+if (mOldPosition == position)
 return;
-}
+
+mOldPosition = position; //new position!
 
 String country = null;
 



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

[tor-commits] [orbot/master] make sure all the activities we need are included

2018-05-11 Thread n8fr8

commit be61431834dc94a5845b8d25739bf321e1e00e1a
Author: n8fr8 
Date:   Sat May 12 00:25:14 2018 -0400

make sure all the activities we need are included
---
 app/src/main/AndroidManifest.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 71e64e1a..56db8266 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -154,6 +154,9 @@
 android:value=".OrbotMainActivity" />
 
 
+
+
+
 https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] go back to one manifest will all perms

2018-05-11 Thread n8fr8

commit be1f73ee9ab67c5a574cf31b442a889266f2678e
Author: n8fr8 
Date:   Fri May 11 23:01:54 2018 -0400

go back to one manifest will all perms
---
 app/src/main/AndroidManifest.xml | 19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 813afabf..71e64e1a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,10 +7,14 @@
 
 
 
+
+
+
 
+ it's a good idea to explicitly include this declaration. -->
 
+
 
+tools:replace="android:allowBackup"
+>
 
 
 
-
+
 
+android:stopWithTask="false">
 
-
-
-
 
 
 
\ No newline at end of file



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

[tor-commits] [orbot/master] update tor vpn values to 192.168.200 base

2018-05-11 Thread n8fr8

commit 89906a28f55edd891daad4f92920ff28b3683c90
Author: n8fr8 
Date:   Sat May 12 00:45:43 2018 -0400

update tor vpn values to 192.168.200 base
some people might have conflicts with 10.10.10 base VPN
---
 .../main/java/org/torproject/android/service/vpn/OrbotVpnManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
 
b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
index e19b8847..e5419f3c 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
@@ -297,8 +297,8 @@ public class OrbotVpnManager implements Handler.Callback {
final String vpnName = "OrbotVPN";
final String localhost = "127.0.0.1";
 
-   final String virtualGateway = "10.10.10.1";
-   final String virtualIP = "10.10.10.2";
+   final String virtualGateway = "192.168.200.1";
+   final String virtualIP = "192.168.200.2";
final String virtualNetMask = "255.255.255.0";
final String dummyDNS = "1.1.1.1"; //this is 
intercepted by the tun2socks library, but we must put in a valid DNS to start
final String defaultRoute = "0.0.0.0";



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

[tor-commits] [orbot/master] update gradle to 3.1.2

2018-05-11 Thread n8fr8

commit 0d3ef7c70e0245d29e824bd82d0f9ed20bb22324
Author: n8fr8 
Date:   Wed May 9 13:30:49 2018 -0400

update gradle to 3.1.2
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8964b5f0..23efb02b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 google()
 }
 dependencies {
-classpath 'com.android.tools.build:gradle:3.1.1'
+classpath 'com.android.tools.build:gradle:3.1.2'
 }
 }
 



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

[tor-commits] [orbot/master] make sure we handle foreground notifications properly

2018-05-11 Thread n8fr8

commit fa017cf3759fee2405288c6d529eceee60be632c
Author: n8fr8 
Date:   Sat May 12 00:25:45 2018 -0400

make sure we handle foreground notifications properly
---
 .../java/org/torproject/android/service/TorService.java   | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

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 5ad9955c..f63eb255 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -368,8 +368,12 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
 
expandedView.setOnClickPendingIntent(R.id.action_refresh,pendingIntent);
 mNotification.bigContentView = expandedView;
 }
-
-if (Prefs.persistNotifications() && (!mNotificationShowing))
+
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ startForeground(NOTIFY_ID, mNotification);
+ }
+ else if (Prefs.persistNotifications() && (!mNotificationShowing))
 {
 startForeground(NOTIFY_ID, mNotification);
 logNotice("Set background service to FOREGROUND");
@@ -644,13 +648,12 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
 boolean success = installer.installResources();
 
 if (success)
-
prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit();
-
+
prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).apply();
 
-OtherResourceInstaller oInstaller = new 
OtherResourceInstaller(this, appBinHome);
-oInstaller.installResources();
 }
 
+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] [orbot/master] don't show app vpn selection for devices that don't support it

2018-05-11 Thread n8fr8

commit 93e6cf3e560211cab453558f2f0ca5a5b970e2bf
Author: n8fr8 
Date:   Wed May 9 13:32:20 2018 -0400

don't show app vpn selection for devices that don't support it
---
 .../android/ui/onboarding/OnboardingActivity.java  | 26 --
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git 
a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
 
b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
index dbe329a4..a8bad692 100644
--- 
a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
+++ 
b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
@@ -17,6 +17,7 @@ import com.github.paolorotolo.appintro.AppIntro;
 import org.torproject.android.R;
 import org.torproject.android.settings.LocaleHelper;
 import org.torproject.android.ui.AppManagerActivity;
+import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
 import org.torproject.android.vpn.VPNEnableActivity;
 
 import java.util.List;
@@ -49,21 +50,22 @@ public class OnboardingActivity extends AppIntro {
 });
 addSlide(cs2);
 
-CustomSlideBigText cs3 = 
CustomSlideBigText.newInstance(R.layout.custom_slide_big_text);
-cs3.setTitle(getString(R.string.vpn_setup));
-cs3.setSubTitle(getString(R.string.vpn_setup_sub));
-cs3.showButton(getString(R.string.action_vpn_choose), new 
View.OnClickListener() {
-@Override
-public void onClick(View v) {
-startActivity(new Intent(OnboardingActivity.this, 
VPNEnableActivity.class));
-startActivityForResult(new Intent(OnboardingActivity.this, 
AppManagerActivity.class), );
-
-}
-});
-addSlide(cs3);
+if (PermissionManager.isLollipopOrHigher()) {
 
+CustomSlideBigText cs3 = 
CustomSlideBigText.newInstance(R.layout.custom_slide_big_text);
+cs3.setTitle(getString(R.string.vpn_setup));
+cs3.setSubTitle(getString(R.string.vpn_setup_sub));
+cs3.showButton(getString(R.string.action_vpn_choose), new 
View.OnClickListener() {
+@Override
+public void onClick(View v) {
+startActivity(new Intent(OnboardingActivity.this, 
VPNEnableActivity.class));
+startActivityForResult(new Intent(OnboardingActivity.this, 
AppManagerActivity.class), );
 
+}
+});
+addSlide(cs3);
 
+}
 
 // OPTIONAL METHODS
 // Override bar/separator color.



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

[tor-commits] [orbot/master] update to use tor-0.3.2.10-dev build with new tor binary method

2018-05-11 Thread n8fr8

commit 3dc40b8adf2339e15fc3c30bf5ea13c547066d59
Author: n8fr8 
Date:   Wed May 9 13:31:13 2018 -0400

update to use tor-0.3.2.10-dev build with new tor binary method
---
 orbotservice/build.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
index c5e113fe..d5e6d5a3 100644
--- a/orbotservice/build.gradle
+++ b/orbotservice/build.gradle
@@ -7,7 +7,6 @@ android {
 sourceSets {
 main {
 jni.srcDirs = []
-
 }
 }
 
@@ -28,9 +27,9 @@ android {
 
 dependencies {
 implementation project(':jsocksAndroid')
-implementation 'org.torproject:tor-android-binary:0.3.2.10'
+implementation 'org.torproject:tor-android-binary:0.3.2.10-dev'
 implementation 'com.android.support:appcompat-v7:27.1.1'
 implementation 'com.jrummyapps:android-shell:1.0.1'
-implementation fileTree(dir: 'libs', include: ['*.jar','*.so'])
+implementation fileTree(dir: 'libs', include: ['.so'])
 testImplementation 'junit:junit:4.12'
 }



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

[tor-commits] [orbot/master] update dependency command

2018-05-11 Thread n8fr8

commit c6630b914ef25f00623ae90219d0900a61a136ba
Author: n8fr8 
Date:   Sat Apr 21 23:28:37 2018 -0400

update dependency command
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a07d61c3..88c7424a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,7 +47,7 @@ android {
 
 dependencies {
 implementation 'com.android.support.constraint:constraint-layout:1.1.0'
-compile project(':orbotservice')
+implementation project(':orbotservice')
 implementation 'com.android.support:design:27.1.1'
 implementation 'pl.bclogic:pulsator4droid:1.0.3'
 implementation 'com.github.apl-devs:appintro:v4.2.2'



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

[tor-commits] [orbot/master] update proguard rules

2018-05-11 Thread n8fr8

commit 142d934d75c5131cfc7e2dacad3e1fb5edf9005a
Author: n8fr8 
Date:   Wed May 9 13:30:05 2018 -0400

update proguard rules
---
 app/proguard-rules.txt | 77 --
 project.properties |  1 +
 2 files changed, 7 insertions(+), 71 deletions(-)

diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt
index 126e1ff5..bc4eb0c1 100644
--- a/app/proguard-rules.txt
+++ b/app/proguard-rules.txt
@@ -1,71 +1,6 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /home/n8fr8/dev/android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
--optimizationpasses 5
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontskipnonpubliclibraryclassmembers
--dontpreverify
--verbose
--repackageclasses ''
--allowaccessmodification
--keepattributes *Annotation*
-
--injars src/main/libs
-
--outjars bin/classes-processed.jar
-
--dontwarn javax.naming.**
--dontwarn android.support.**
-
-
-
--keep class org.**  { *; }
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
-
--keepclasseswithmembernames class * {
-native ;
-}
-
--keepclasseswithmembers class * {
-public (android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembers class * {
-public (android.content.Context, android.util.AttributeSet, int);
-}
-
--keepclassmembers class * extends android.app.Activity {
-   public void *(android.view.View);
-}
-
--keepclassmembers enum * {
-public static **[] values();
-public static ** valueOf(java.lang.String);
-}
-
--keep class * implements android.os.Parcelable {
-  public static final android.os.Parcelable$Creator *;
-}
+-keepattributes Signature
+-keepattributes Annotation
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
+-dontwarn okio.**
\ No newline at end of file
diff --git a/project.properties b/project.properties
index 145c9f25..a6be9bae 100644
--- a/project.properties
+++ b/project.properties
@@ -6,6 +6,7 @@
 # To customize properties used by the Ant build system use,
 # "ant.properties", and override values to adapt the script to your
 # project structure.
+proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt
 
#proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:proguard-project.txt
 
 # Project target.



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

[tor-commits] [orbot/master] remove old fullperm manifest

2018-05-11 Thread n8fr8

commit 989cbb20ab9e078b4dd97b0086e4925dbc72964b
Author: n8fr8 
Date:   Fri May 11 23:02:14 2018 -0400

remove old fullperm manifest
---
 app/src/fullperm/AndroidManifest.xml | 163 ---
 1 file changed, 163 deletions(-)

diff --git a/app/src/fullperm/AndroidManifest.xml 
b/app/src/fullperm/AndroidManifest.xml
deleted file mode 100644
index 2e60b66e..
--- a/app/src/fullperm/AndroidManifest.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-
-http://schemas.android.com/apk/res/android;
-xmlns:tools="http://schemas.android.com/tools;
-package="org.torproject.android"
-android:installLocation="auto">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-   
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file



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

[tor-commits] [orbot/master] updating to build 16010011

2018-05-11 Thread n8fr8

commit bc863d4caeb0756f800a42798afbcf9b0739
Author: n8fr8 
Date:   Fri Apr 20 00:33:50 2018 -0400

updating to build 16010011
---
 app/build.gradle | 4 ++--
 app/src/fullperm/AndroidManifest.xml | 4 
 app/src/main/AndroidManifest.xml | 3 ---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 38d1a6d5..a07d61c3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,8 +39,8 @@ android {
 minSdkVersion 16
 applicationId 'org.torproject.android'
 targetSdkVersion 27
-versionCode 1611
-versionName '16.0.0-RC-2-multi-SDK16'
+versionCode 16010011
+versionName '16.0.1-BETA-1'
 }
 }
 }
diff --git a/app/src/fullperm/AndroidManifest.xml 
b/app/src/fullperm/AndroidManifest.xml
index d2497e4c..2e60b66e 100644
--- a/app/src/fullperm/AndroidManifest.xml
+++ b/app/src/fullperm/AndroidManifest.xml
@@ -4,10 +4,6 @@
 package="org.torproject.android"
 android:installLocation="auto">
 
-
-
 
 
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 81d5d356..813afabf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,9 +68,6 @@
 android:exported="false"
 android:label="@string/app_name" />
 
-
 https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge pull request #146 from bitmold/package-refactor

2018-05-11 Thread n8fr8

commit a94d2c982b3dab5cbb85e26400e477cccfb18156
Merge: 2b401050 5f337887
Author: Nathan Freitas 
Date:   Mon Apr 30 14:01:18 2018 -0400

Merge pull request #146 from bitmold/package-refactor

Control Package Didn't Match Directory

 .../java/{net/freehaven/tor => org/torproject/android}/control/.cvsignore | 0
 .../java/{net/freehaven/tor => org/torproject/android}/control/Bytes.java | 0
 .../freehaven/tor => org/torproject/android}/control/ConfigEntry.java | 0
 .../freehaven/tor => org/torproject/android}/control/EventHandler.java| 0
 .../tor => org/torproject/android}/control/NullEventHandler.java  | 0
 .../freehaven/tor => org/torproject/android}/control/PasswordDigest.java  | 0
 .../java/{net/freehaven/tor => org/torproject/android}/control/README | 0
 .../tor => org/torproject/android}/control/TorControlCommands.java| 0
 .../tor => org/torproject/android}/control/TorControlConnection.java  | 0
 .../freehaven/tor => org/torproject/android}/control/TorControlError.java | 0
 .../tor => org/torproject/android}/control/TorControlSyntaxError.java | 0
 .../freehaven/tor => org/torproject/android}/control/examples/.cvsignore  | 0
 .../torproject/android}/control/examples/DebuggingEventHandler.java   | 0
 .../freehaven/tor => org/torproject/android}/control/examples/Main.java   | 0
 14 files changed, 0 insertions(+), 0 deletions(-)



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

[tor-commits] [orbot/master] update implementation of language selector

2018-05-11 Thread n8fr8

commit 93a0092cda4db50d435d8478649afe45799ff863
Author: n8fr8 
Date:   Fri May 11 22:53:52 2018 -0400

update implementation of language selector
---
 app/build.gradle  |  3 ++-
 app/src/main/java/org/torproject/android/OrbotApp.java|  9 -
 .../java/org/torproject/android/settings/Languages.java   | 11 ---
 .../torproject/android/settings/SettingsPreferences.java  | 13 -
 app/src/main/res/xml-fa/preferences.xml   | 15 ---
 app/src/main/res/xml/preferences.xml  |  9 -
 6 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3c106337..9e55cdde 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ android {
 buildToolsVersion '27.0.3'
 defaultConfig {
 applicationId "org.torproject.android"
-minSdkVersion 16
+minSdkVersion 14
 targetSdkVersion 27
 }
 lintOptions {
@@ -76,6 +76,7 @@ android {
 }
 
 dependencies {
+implementation 'com.github.delight-im:Android-Languages:v1.0.1'
 implementation 'com.android.support.constraint:constraint-layout:1.1.0'
 implementation project(':orbotservice')
 implementation 'com.android.support:design:27.1.1'
diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java 
b/app/src/main/java/org/torproject/android/OrbotApp.java
index 2bca1b45..0e8e1375 100644
--- a/app/src/main/java/org/torproject/android/OrbotApp.java
+++ b/app/src/main/java/org/torproject/android/OrbotApp.java
@@ -33,6 +33,8 @@ import org.torproject.android.settings.LocaleHelper;
 import java.util.Locale;
 import java.util.Set;
 
+import im.delight.android.languages.Language;
+
 public class OrbotApp extends Application implements OrbotConstants
 {
 
@@ -42,8 +44,11 @@ public class OrbotApp extends Application implements 
OrbotConstants
 public void onCreate() {
 super.onCreate();
 
+/**
 Languages.setup(OrbotMainActivity.class, R.string.menu_settings);
 Languages.setLanguage(this, Prefs.getDefaultLocale(), true);
+ **/
+Language.setFromPreference(this, "pref_default_locale");
 
 //check for updates via github, since it is unlikely to be blocked; 
notify the user of places where upgrades can be found
 new AppUpdater(this)
@@ -61,7 +66,9 @@ public class OrbotApp extends Application implements 
OrbotConstants
 @Override
 public void onConfigurationChanged(Configuration newConfig) {
 super.onConfigurationChanged(newConfig);
-   //Log.i(TAG, "onConfigurationChanged " + 
newConfig.locale.getLanguage());
+Language.setFromPreference(this, "pref_default_locale");
+
+//Log.i(TAG, "onConfigurationChanged " + 
newConfig.locale.getLanguage());
 //Languages.setLanguage(this, Prefs.getDefaultLocale(), true);
 }
/**
diff --git a/app/src/main/java/org/torproject/android/settings/Languages.java 
b/app/src/main/java/org/torproject/android/settings/Languages.java
index 90ad805c..abed8838 100644
--- a/app/src/main/java/org/torproject/android/settings/Languages.java
+++ b/app/src/main/java/org/torproject/android/settings/Languages.java
@@ -216,17 +216,6 @@ public class Languages {
 return nameMap.values().toArray(new String[nameMap.size()]);
 }
 
-public int getPosition(Locale locale) {
-String localeName = locale.getLanguage();
-int i = 0;
-for (String key : nameMap.keySet())
-if (TextUtils.equals(key, localeName))
-return i;
-else
-i++;
-return -1;
-}
-
 /**
  * Get sorted list of supported locales.
  *
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 fb01cde1..513432a1 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,8 @@ import android.preference.PreferenceActivity;
 import org.torproject.android.R;
 import org.torproject.android.service.util.Prefs;
 
+import im.delight.android.languages.Language;
+
 public class SettingsPreferences
 extends PreferenceActivity {
 private static final String TAG = "SettingsPreferences";
@@ -26,10 +28,12 @@ public class SettingsPreferences
 addPreferencesFromResource(R.xml.preferences);
 
getPreferenceManager().setSharedPreferencesMode(Context.MODE_MULTI_PROCESS);
 
+
 prefLocale = (ListPreference) findPreference("pref_default_locale");
+/**
 Languages languages = Languages.get(this);
 prefLocale.setEntries(languages.getAllNames());
-prefLocale.setEntryValues(languages.getSupportedLocales());
+

[tor-commits] [orbot/master] update to tor 0.3.3.5-rc

2018-05-11 Thread n8fr8

commit 7dd09db7b08c93fb18bd98c49a6b49a88100e295
Author: n8fr8 
Date:   Sat May 12 00:25:30 2018 -0400

update to tor 0.3.3.5-rc
---
 orbotservice/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
index d5e6d5a3..020ce563 100644
--- a/orbotservice/build.gradle
+++ b/orbotservice/build.gradle
@@ -27,7 +27,7 @@ android {
 
 dependencies {
 implementation project(':jsocksAndroid')
-implementation 'org.torproject:tor-android-binary:0.3.2.10-dev'
+implementation 'org.torproject:tor-android-binary:0.3.3.5-rc-1'
 implementation 'com.android.support:appcompat-v7:27.1.1'
 implementation 'com.jrummyapps:android-shell:1.0.1'
 implementation fileTree(dir: 'libs', include: ['.so'])



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

[tor-commits] [orbot/master] load PT binaries fromthe native library path

2018-05-11 Thread n8fr8

commit ad18a409f9bd0dcc4dd31e62ef8a01cabea0559c
Author: n8fr8 
Date:   Wed May 9 13:31:48 2018 -0400

load PT binaries fromthe native library path
---
 .../android/service/util/OtherResourceInstaller.java   | 14 --
 1 file changed, 12 insertions(+), 2 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 9768432c..9584e9b0 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
@@ -3,6 +3,7 @@ package org.torproject.android.service.util;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -16,6 +17,7 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
 import android.os.Build;
 import android.util.Log;
 
@@ -74,12 +76,14 @@ public class OtherResourceInstaller implements 
TorServiceConstants {
 if (!installFolder.exists())
 installFolder.mkdirs();
 
-is = context.getAssets().open(cpuPath + '/' + OBFSCLIENT_ASSET_KEY + 
MP3_EXT);
+ //   is = context.getAssets().open(cpuPath + '/' + OBFSCLIENT_ASSET_KEY + 
MP3_EXT);
+is = new FileInputStream(new 
File(getNativeLibraryDir(context),OBFSCLIENT_ASSET_KEY + ".so"));
 outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY);
 streamToFile(is,outFile, false, true);
 setExecutable(outFile);
 
-is = context.getAssets().open(cpuPath + '/' + PDNSD_ASSET_KEY + 
MP3_EXT);
+//is = context.getAssets().open(cpuPath + '/' + PDNSD_ASSET_KEY + 
MP3_EXT);
+is = new FileInputStream(new 
File(getNativeLibraryDir(context),PDNSD_ASSET_KEY + ".so"));
 outFile = new File(installFolder, PDNSD_ASSET_KEY);
 streamToFile(is,outFile, false, true);
 setExecutable(outFile);
@@ -88,6 +92,12 @@ public class OtherResourceInstaller implements 
TorServiceConstants {
 return true;
 }
 
+// Return Full path to the directory where native JNI libraries are stored.
+private static String getNativeLibraryDir(Context context) {
+ApplicationInfo appInfo = context.getApplicationInfo();
+return appInfo.nativeLibraryDir;
+}
+
 public boolean updateTorConfigCustom (File fileTorRcCustom, String 
extraLines) throws IOException, FileNotFoundException, TimeoutException
 {
 if (fileTorRcCustom.exists())



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

[tor-commits] [orbot/master] control package name didnt match dir

2018-05-11 Thread n8fr8

commit 5f337887d1c50c48398f6597fb45026ecf9edff0
Author: lexi 
Date:   Mon Apr 30 12:04:27 2018 -0400

control package name didnt match dir
---
 .../java/{net/freehaven/tor => org/torproject/android}/control/.cvsignore | 0
 .../java/{net/freehaven/tor => org/torproject/android}/control/Bytes.java | 0
 .../freehaven/tor => org/torproject/android}/control/ConfigEntry.java | 0
 .../freehaven/tor => org/torproject/android}/control/EventHandler.java| 0
 .../tor => org/torproject/android}/control/NullEventHandler.java  | 0
 .../freehaven/tor => org/torproject/android}/control/PasswordDigest.java  | 0
 .../java/{net/freehaven/tor => org/torproject/android}/control/README | 0
 .../tor => org/torproject/android}/control/TorControlCommands.java| 0
 .../tor => org/torproject/android}/control/TorControlConnection.java  | 0
 .../freehaven/tor => org/torproject/android}/control/TorControlError.java | 0
 .../tor => org/torproject/android}/control/TorControlSyntaxError.java | 0
 .../freehaven/tor => org/torproject/android}/control/examples/.cvsignore  | 0
 .../torproject/android}/control/examples/DebuggingEventHandler.java   | 0
 .../freehaven/tor => org/torproject/android}/control/examples/Main.java   | 0
 14 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/.cvsignore 
b/orbotservice/src/main/java/org/torproject/android/control/.cvsignore
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/.cvsignore
rename to orbotservice/src/main/java/org/torproject/android/control/.cvsignore
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/Bytes.java 
b/orbotservice/src/main/java/org/torproject/android/control/Bytes.java
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/Bytes.java
rename to orbotservice/src/main/java/org/torproject/android/control/Bytes.java
diff --git 
a/orbotservice/src/main/java/net/freehaven/tor/control/ConfigEntry.java 
b/orbotservice/src/main/java/org/torproject/android/control/ConfigEntry.java
similarity index 100%
rename from 
orbotservice/src/main/java/net/freehaven/tor/control/ConfigEntry.java
rename to 
orbotservice/src/main/java/org/torproject/android/control/ConfigEntry.java
diff --git 
a/orbotservice/src/main/java/net/freehaven/tor/control/EventHandler.java 
b/orbotservice/src/main/java/org/torproject/android/control/EventHandler.java
similarity index 100%
rename from 
orbotservice/src/main/java/net/freehaven/tor/control/EventHandler.java
rename to 
orbotservice/src/main/java/org/torproject/android/control/EventHandler.java
diff --git 
a/orbotservice/src/main/java/net/freehaven/tor/control/NullEventHandler.java 
b/orbotservice/src/main/java/org/torproject/android/control/NullEventHandler.java
similarity index 100%
rename from 
orbotservice/src/main/java/net/freehaven/tor/control/NullEventHandler.java
rename to 
orbotservice/src/main/java/org/torproject/android/control/NullEventHandler.java
diff --git 
a/orbotservice/src/main/java/net/freehaven/tor/control/PasswordDigest.java 
b/orbotservice/src/main/java/org/torproject/android/control/PasswordDigest.java
similarity index 100%
rename from 
orbotservice/src/main/java/net/freehaven/tor/control/PasswordDigest.java
rename to 
orbotservice/src/main/java/org/torproject/android/control/PasswordDigest.java
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/README 
b/orbotservice/src/main/java/org/torproject/android/control/README
similarity index 100%
rename from orbotservice/src/main/java/net/freehaven/tor/control/README
rename to orbotservice/src/main/java/org/torproject/android/control/README
diff --git 
a/orbotservice/src/main/java/net/freehaven/tor/control/TorControlCommands.java 
b/orbotservice/src/main/java/org/torproject/android/control/TorControlCommands.java
similarity index 100%
rename from 
orbotservice/src/main/java/net/freehaven/tor/control/TorControlCommands.java
rename to 
orbotservice/src/main/java/org/torproject/android/control/TorControlCommands.java
diff --git 
a/orbotservice/src/main/java/net/freehaven/tor/control/TorControlConnection.java
 
b/orbotservice/src/main/java/org/torproject/android/control/TorControlConnection.java
similarity index 100%
rename from 
orbotservice/src/main/java/net/freehaven/tor/control/TorControlConnection.java
rename to 
orbotservice/src/main/java/org/torproject/android/control/TorControlConnection.java
diff --git 
a/orbotservice/src/main/java/net/freehaven/tor/control/TorControlError.java 
b/orbotservice/src/main/java/org/torproject/android/control/TorControlError.java
similarity index 100%
rename from 
orbotservice/src/main/java/net/freehaven/tor/control/TorControlError.java
rename to 
orbotservice/src/main/java/org/torproject/android/control/TorControlError.java
diff --git 
a/orbotservice/src/main/java/net/freehaven/tor/control/TorControlSyntaxError.java

[tor-commits] [orbot/master] updating store descriptions

2018-05-11 Thread n8fr8

commit a957986762943b2bbaac4709808e312103c2f22a
Author: n8fr8 
Date:   Fri Apr 20 00:32:27 2018 -0400

updating store descriptions
---
 description/ar.xlf |  12 +++
 description/ca.xlf |   2 +-
 description/eu.xlf |  15 ++--
 description/fa.xlf |   2 +-
 description/fr.xlf |  18 +-
 description/ga.xlf | 104 +
 description/hi.xlf |   2 +-
 description/it.xlf |   2 +-
 description/ro.xlf |   2 +-
 description/ta.xlf |  19 ++
 description/uk.xlf |   6 ++--
 11 files changed, 158 insertions(+), 26 deletions(-)

diff --git a/description/ar.xlf b/description/ar.xlf
index 52e16a3c..ed555de0 100644
--- a/description/ar.xlf
+++ b/description/ar.xlf
@@ -11,7 +11,7 @@
   
   
 Protect your privacy with this proxy with Tor
-ØÙØ§ÙØ© Ø®ØµÙØµÙØªÙ ÙØ¹ ÙØ°Ø§ Ø§ÙÙÙÙÙ  - 
Ø§ÙØ¨Ø±ÙÙØ³Ù ÙØ¹ ØªÙØ±
+ÙÙ Ø¨ØÙØ§ÙØ© Ø®ØµÙØµÙØªÙ ÙØ¹ ÙÙÙÙ 
Ø§ÙØ¨Ø±ÙÙØ³Ù ÙØ°Ø§ Ø¨ÙØ¶Ù Ø´Ø¨ÙØ© ØªÙØ±
 This is limited by Google to 80 
characters
   
   
@@ -20,8 +20,7 @@
   
   
 Orbot is the only app that creates a truly private internet 
connection. As the New York Times writes, âwhen a communication arrives from 
Tor, you can never know where or whom itâs from.â Tor won the 2012 
Electronic Frontier Foundation (EFF) Pioneer Award.
-Ø§ÙØ±Ø¨ÙØª ÙÙ Ø§ÙØªØ·Ø¨ÙÙ Ø§ÙÙØÙØ¯ ØÙÙÙØ©Ù 
Ø§ÙØ°Ù ÙÙÙÙ Ø¨Ø¥ÙØ´Ø§Ø¡ Ø§ØªØµØ§Ù Ø§Ø§ÙØªØ±ÙØª Ø®Ø§Øµ ÙØ§ÙÙÙÙ 
ØªØ¹ÙØ¨Ù . ÙÙÙØ§ ÙØªØ¨Øª ØµØÙÙØ© ÙÙÙÙÙØ±Ù ØªØ§ÙÙØ² Ø§ÙØ£Ù
Ø±ÙÙÙØ© Ø   Ø¹ÙØ¯ ÙØµÙÙ Ø¨ÙØ§Øº ÙÙ ØªÙØ± Ø ÙÙ ØªØ³ØªØ·ÙØ¹ 
Ø£Ø¨Ø¯Ø§Ù ÙØ¹Ø±ÙØ© Ø£ÙÙ Ø Ø£Ù ÙÙ Ø£Ù ÙÙØ§Ù ÙØ£ØªÙ Ø  .
-ÙØ§Ø²Øª ØªÙØ± ÙÙ Ø¹Ø§Ù 2012 ÙÙ Ø·Ø±Ù ÙØ¤Ø³Ø³Ø© Ø§ÙØØ¯ÙØ¯ 
Ø§ÙØ¥ÙÙØªØ±ÙÙÙØ© (EFF) Ø¨Ø¬Ø§Ø¦Ø²Ø© Ø§ÙØ±ÙØ§Ø¯Ø© .
+Ø§ÙØ±Ø¨ÙØª ÙÙ Ø§ÙØªØ·Ø¨ÙÙ Ø§ÙÙØÙØ¯ Ø§ÙØ°Ù ÙÙÙÙ
 Ø¨Ø¥ÙØ´Ø§Ø¡ Ø§ØªØµØ§Ù Ø®Ø§Øµ Ù ØÙÙÙÙ Ø¨Ø§ÙØ¥ÙØªØ±ÙØª ÙØ§ÙÙÙÙ 
ØªØ¹ÙØ¨Ù . ÙÙÙØ§ ÙØªØ¨Øª ØµØÙÙØ© ÙÙÙÙÙØ±Ù ØªØ§ÙÙØ² Ø§ÙØ£Ù
Ø±ÙÙÙØ© Ø  Ø¹ÙØ¯ ÙØµÙÙ Ø¨ÙØ§Øº  Ø§Ù Ø§ØªØµØ§Ù Ø¹Ø¨Ø± ØªÙØ± Ø 
ÙÙ ØªØ³ØªØ·ÙØ¹ Ø£Ø¨Ø¯Ø§Ù ÙØ¹Ø±ÙØ© ÙÙÙ Ø£Ù ÙÙÙ Ø£Ù ÙÙØ§Ù 
Ø£ØªÙ. Ù ÙØ§Ø²Øª ØªÙØ± Ø¹Ø§Ù 2012 Ø¨Ø¬Ø§Ø¦Ø²Ø© Ø§ÙØ±ÙØ§Ø¯Ø© Ø§ÙÙ
ÙØ¸ÙØ© ÙÙ Ø·Ø±Ù Ø¬ÙØ¹ÙØ© Ø§ÙØØ¯ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙØ© (EFF). 

   
   
 ACCEPT NO SUBSTITUTES: Orbot is the safest way to use the 
Internet on Android. Period. Orbot bounces your encrypted traffic several times 
through computers around the world, instead of connecting you directly like 
VPNs and proxies. This process takes a little longer, but the strongest privacy 
and identity protection available is worth the wait.
@@ -42,7 +41,7 @@ ITâS OFFICIAL: This is the official version of the Tor 
onion routing service f
   
   
 ***Expert Root Mode***
-*** ÙØ¶Ø¹ Ø®Ø¨Ø±Ø§Ø¡ Ø§ÙÙØµØ¯Ø± - Ø§ÙØ¬Ø°Ø± ***
+*** ÙØ¶Ø¹ Ø®Ø¨Ø±Ø§Ø¡ Ø§ÙÙØµØ¯Ø± - Ø§ÙØ¬Ø°Ø± *** 
Ø§ÙØ³Ø¨Ø±Øª ÙÙÙØ¶
   
   
 UNIVERSAL MODE: Orbot can be configured to transparently proxy 
all of your Internet traffic through Tor. You can also choose which specific 
apps you want to use through Tor.
@@ -72,7 +71,7 @@ ITâS OFFICIAL: This is the official version of the Tor 
onion routing service f
   
   
 â ABOUT US: Guardian Project is a group of developers that 
make secure mobile apps and open-source code for a better tomorrow
-â ÙÙÙ ÙØÙ : ÙØ´Ø±ÙØ¹ Ø§ÙØ¬Ø§Ø±Ø¯ÙØ§Ù ÙÙ ÙØ¬Ù
ÙØ¹Ø© ÙÙ Ø§ÙÙØ·ÙØ±ÙÙ Ø§ÙØ°ÙÙ ÙØ£ÙÙÙÙÙ ØªØ·Ø¨ÙÙØ§Øª 
Ø§ÙÙÙØ§ØªÙ ÙÙØªÙØØ© Ø§ÙÙØµØ¯Ø±  ÙÙ Ø£Ø¬Ù Ø§ÙØ£ÙØ§Ù ÙØºØ¯ 
Ø£ÙØ¶Ù
+â ÙÙÙ ÙØÙ : ÙØ´Ø±ÙØ¹ Ø§ÙØ¬Ø§Ø±Ø¯ÙØ§Ù ÙØ¬ÙÙØ¹Ø© 
ÙÙ Ø§ÙÙØ·ÙØ±ÙÙ Ø§ÙØ°ÙÙ ÙØ·ÙØ±ÙÙ ØªØ·Ø¨ÙÙØ§Øª Ø¢ÙÙØ© Ù Ù
ÙØªÙØØ© Ø§ÙÙØµØ¯Ø± ÙÙÙÙØ§ØªÙ ÙÙ Ø£Ø¬Ù ØºØ¯Ù Ø£ÙØ¶Ù
   
   
 â OUR WEBSITE: https://GuardianProject.info
@@ -97,8 +96,7 @@ ITâS OFFICIAL: This is the official version of the Tor 
onion routing service f
   
   
 â MESSAGE US: Are we missing your favorite feature? Found an 
annoying bug? Please tell us! Weâd love to hear from you. Send us an email: 
supp...@guardianproject.info or find us in our chat room 
https://guardianproject.info/contact
-â Ø±Ø³Ø§ÙØªÙØ§ : ÙÙ ÙØÙ Ø£Ø¶Ø¹ÙØ§ Ø®ØµÙØµÙØªÙ 
Ø§ÙÙÙØ¶ÙØ© Ø§ÙØªÙ ØªØ¨ØØ« Ø¹ÙÙØ§ Ø ÙÙ ØªØ¬Ø¯ ÙØ§ÙØ²Ø¹Ø¬Ù Ø 
Ø£Ø±Ø¬ÙÙ Ø£Ø®Ø¨Ø±ÙØ§ ! ÙØØ¨ Ø£Ù ÙØ³ÙØ¹ ÙÙÙ .  Ø±Ø§Ø³ÙÙØ§ Ø¹ÙÙ 
Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ: supp...@guardianproject.info 
-Ø£Ù ØªØ¬Ø¯ÙØ§ ÙÙ ØºØ±ÙØªÙØ§ ÙÙÙØ±Ø§Ø³ÙØ© 
https://guardianproject.info/contact
+â Ø±Ø§Ø³ÙÙÙØ§ : ÙÙ ÙØ³ÙÙØ§ Ø¥Ø¶Ø§ÙØ© ÙÙØ²ØªÙ 
Ø§ÙÙÙØ¶ÙØ© Ø§ÙØªÙ ØªØ¨ØØ« Ø¹ÙÙØ§ Ø ÙÙ ØµØ§Ø¯ÙØª Ø®ÙÙØ§ ÙØ§ 
ÙØ²Ø¹Ø¬Ù Ø ÙØ±Ø¬ÙÙ Ø£Ù

[tor-commits] [orbot/master] always show the hidden service menu

2018-05-11 Thread n8fr8

commit 074411a65a2539bd231fe26e5549d8d843deecc4
Author: n8fr8 
Date:   Wed May 9 13:33:18 2018 -0400

always show the hidden service menu
---
 app/src/main/java/org/torproject/android/OrbotMainActivity.java | 6 --
 1 file changed, 6 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 06a2c4bd..c8a329c3 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -425,12 +425,6 @@ public class OrbotMainActivity extends AppCompatActivity
 super.onCreateOptionsMenu(menu);
 MenuInflater inflater = getMenuInflater();
 inflater.inflate(R.menu.orbot_main, menu);
-
-//We don't support these on per SDK 23
-if (BuildConfig.FLAVOR.equals("minimalperm")) {
-menu.findItem(R.id.menu_hidden_services_main).setVisible(false);
-}
-
 return true;
 }
 



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

[tor-commits] [orbot/master] implement APK splits for architecture specific builds

2018-05-11 Thread n8fr8

commit 49b72280643179cccd43939e669725d8f43deb70
Author: n8fr8 
Date:   Wed May 9 13:30:20 2018 -0400

implement APK splits for architecture specific builds
---
 app/build.gradle | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 88c7424a..da6d9ff8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ android {
 }
 buildTypes {
 release {
-minifyEnabled false
+minifyEnabled true
 proguardFiles getDefaultProguardFile('proguard-android.txt'), 
'proguard-rules.txt'
 }
 }
@@ -43,6 +43,31 @@ android {
 versionName '16.0.1-BETA-1'
 }
 }
+
+splits {
+
+// Configures multiple APKs based on ABI. This helps keep the size 
down, since PT binaries can be large.
+abi {
+
+// Enables building multiple APKs per ABI.
+enable true
+
+// By default all ABIs are included, so use reset() and include to 
specify that we only
+// want APKs for x86 and x86_64.
+
+// Resets the list of ABIs that Gradle should create APKs for to 
none.
+reset()
+
+// Specifies a list of ABIs that Gradle should create APKs for.
+include "x86", "armeabi"
+
+// Specifies that we do not want to also generate a universal APK 
that includes all ABIs.
+universalApk true
+}
+
+
+}
+
 }
 
 dependencies {



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

[tor-commits] [orbot/master] use Tor's built-in HTTP server instead of Polipo

2018-05-11 Thread n8fr8

commit 2b401050d0089fa4dd7527cc4ec840489c81dd4e
Author: n8fr8 
Date:   Sat Apr 21 23:29:29 2018 -0400

use Tor's built-in HTTP server instead of Polipo
---
 .../org/torproject/android/service/TorService.java | 26 +-
 1 file changed, 16 insertions(+), 10 deletions(-)

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 e4f7f13a..5ad9955c 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -89,7 +89,8 @@ import static 
org.torproject.android.binary.TorServiceConstants.BINARY_TOR_VERSI
 
 public class TorService extends Service implements TorServiceConstants, 
OrbotConstants
 {
-
+
+public final static String TOR_VERSION = 
org.torproject.android.binary.TorServiceConstants.BINARY_TOR_VERSION;
 private String mCurrentStatus = STATUS_OFF;
 
 private final static int CONTROL_SOCKET_TIMEOUT = 0;
@@ -130,7 +131,7 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
 public static File appCacheHome;
 
 public static File fileTor;
-public static File filePolipo;
+ //   public static File filePolipo;
 public static File fileObfsclient;
 public static File fileTorRc;
 private File mHSBasePath;
@@ -559,7 +560,7 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
 //mShell = Shell.startShell();
 
 fileTor= new File(appBinHome, TorServiceConstants.TOR_ASSET_KEY);
-filePolipo = new File(appBinHome, 
TorServiceConstants.POLIPO_ASSET_KEY);
+ //   filePolipo = new File(appBinHome, 
TorServiceConstants.POLIPO_ASSET_KEY);
 fileObfsclient = new File(appBinHome, 
TorServiceConstants.OBFSCLIENT_ASSET_KEY);
 fileTorRc = new File(appBinHome, 
TorServiceConstants.TORRC_ASSET_KEY);
 
@@ -696,6 +697,9 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
if (Prefs.openProxyOnAllInterfaces())
extraLines.append("SocksListenAddress 0.0.0.0").append('\n');
 
+extraLines.append("HTTPTunnelPort 
").append(mPortHTTP).append(isolate).append('\n');
+
+
if(prefs.getBoolean(OrbotConstants.PREF_CONNECTION_PADDING, false))
{
extraLines.append("ConnectionPadding 1").append('\n');
@@ -762,7 +766,7 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
 reply.putExtra(EXTRA_SOCKS_PROXY, "socks://127.0.0.1:" + mPortSOCKS);
 reply.putExtra(EXTRA_SOCKS_PROXY_HOST, "127.0.0.1");
 reply.putExtra(EXTRA_SOCKS_PROXY_PORT, mPortSOCKS);
-reply.putExtra(EXTRA_HTTP_PROXY, "http://127.0.0.1; + mPortHTTP);
+reply.putExtra(EXTRA_HTTP_PROXY, "http://127.0.0.1:; + mPortHTTP);
 reply.putExtra(EXTRA_HTTP_PROXY_HOST, "127.0.0.1");
 reply.putExtra(EXTRA_HTTP_PROXY_PORT, mPortHTTP);
 
@@ -817,8 +821,8 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
 
boolean success = runTorShellCmd();
 
-if (mPortHTTP != -1)
-runPolipoShellCmd();
+ //   if (mPortHTTP != -1)
+   // runPolipoShellCmd();
 
 // Tor is running, update new .onion names at db
 ContentResolver mCR = getApplicationContext().getContentResolver();
@@ -971,7 +975,8 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
  **/
 return shellResult.exitCode;
 }
-
+
+/**
 private void updatePolipoConfig () throws FileNotFoundException, 
IOException
 {
 
@@ -987,9 +992,10 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
 
 props.store(new FileWriter(file), "updated");
 
-}
-
+}**/
 
+
+/**
 private void runPolipoShellCmd () throws Exception
 {
 
@@ -1006,7 +1012,7 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
 
 logNotice("Polipo is running");
 
-}
+}**/
 
 protected TorControlConnection getControlConnection ()
 {



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

[tor-commits] [orbot/master] Merge pull request #127 from bitmold/string-fixes

2018-05-11 Thread n8fr8

commit f151b37ce1790120e962708ee7127e5e742f2991
Merge: 923be64f 0eaa2786
Author: Nathan Freitas 
Date:   Fri Apr 20 00:13:12 2018 -0400

Merge pull request #127 from bitmold/string-fixes

Some UI String Fixes

 app/src/main/java/org/torproject/android/OrbotMainActivity.java | 4 ++--
 app/src/main/res/values-az/strings.xml  | 2 +-
 app/src/main/res/values-bg/strings.xml  | 2 +-
 app/src/main/res/values-ca/strings.xml  | 2 +-
 app/src/main/res/values-cs-rCZ/strings.xml  | 2 +-
 app/src/main/res/values-da/strings.xml  | 2 +-
 app/src/main/res/values-el/strings.xml  | 2 +-
 app/src/main/res/values-es-rAR/strings.xml  | 2 +-
 app/src/main/res/values-es/strings.xml  | 2 +-
 app/src/main/res/values-et/strings.xml  | 2 +-
 app/src/main/res/values-eu/strings.xml  | 2 +-
 app/src/main/res/values-fi/strings.xml  | 2 +-
 app/src/main/res/values-gl/strings.xml  | 2 +-
 app/src/main/res/values-he/strings.xml  | 2 +-
 app/src/main/res/values-hr/strings.xml  | 2 +-
 app/src/main/res/values-hu/strings.xml  | 2 +-
 app/src/main/res/values-id/strings.xml  | 2 +-
 app/src/main/res/values-in-rID/strings.xml  | 2 +-
 app/src/main/res/values-is/strings.xml  | 2 +-
 app/src/main/res/values-it/strings.xml  | 2 +-
 app/src/main/res/values-ja/strings.xml  | 2 +-
 app/src/main/res/values-lv/strings.xml  | 2 +-
 app/src/main/res/values-mk/strings.xml  | 2 +-
 app/src/main/res/values-ms-rMY/strings.xml  | 2 +-
 app/src/main/res/values-ms/strings.xml  | 2 +-
 app/src/main/res/values-nl/strings.xml  | 4 ++--
 app/src/main/res/values-pl/strings.xml  | 2 +-
 app/src/main/res/values-pt-rBR/strings.xml  | 2 +-
 app/src/main/res/values-ro/strings.xml  | 2 +-
 app/src/main/res/values-si-rLK/strings.xml  | 2 +-
 app/src/main/res/values-sk/strings.xml  | 2 +-
 app/src/main/res/values-sv/strings.xml  | 2 +-
 app/src/main/res/values-th/strings.xml  | 2 +-
 app/src/main/res/values-tl/strings.xml  | 2 +-
 app/src/main/res/values-vi/strings.xml  | 2 +-
 app/src/main/res/values-zh-rCN/strings.xml  | 2 +-
 app/src/main/res/values-zh-rTW/strings.xml  | 2 +-
 app/src/main/res/values/strings.xml | 4 ++--
 orbotservice/src/main/res/values-az/strings.xml | 2 +-
 orbotservice/src/main/res/values-bg/strings.xml | 2 +-
 orbotservice/src/main/res/values-ca/strings.xml | 2 +-
 orbotservice/src/main/res/values-cs-rCZ/strings.xml | 2 +-
 orbotservice/src/main/res/values-da/strings.xml | 2 +-
 orbotservice/src/main/res/values-el/strings.xml | 2 +-
 orbotservice/src/main/res/values-es/strings.xml | 2 +-
 orbotservice/src/main/res/values-et/strings.xml | 2 +-
 orbotservice/src/main/res/values-eu/strings.xml | 2 +-
 orbotservice/src/main/res/values-fi/strings.xml | 2 +-
 orbotservice/src/main/res/values-gl/strings.xml | 2 +-
 orbotservice/src/main/res/values-hr/strings.xml | 2 +-
 orbotservice/src/main/res/values-hu/strings.xml | 2 +-
 orbotservice/src/main/res/values-id/strings.xml | 2 +-
 orbotservice/src/main/res/values-in-rID/strings.xml | 2 +-
 orbotservice/src/main/res/values-is/strings.xml | 2 +-
 orbotservice/src/main/res/values-it/strings.xml | 2 +-
 orbotservice/src/main/res/values-ja/strings.xml | 2 +-
 orbotservice/src/main/res/values-lv/strings.xml | 2 +-
 orbotservice/src/main/res/values-mk/strings.xml | 2 +-
 orbotservice/src/main/res/values-ms-rMY/strings.xml | 2 +-
 orbotservice/src/main/res/values-ms/strings.xml | 2 +-
 orbotservice/src/main/res/values-nb/strings.xml | 2 +-
 orbotservice/src/main/res/values-nl/strings.xml | 2 +-
 orbotservice/src/main/res/values-pl/strings.xml | 2 +-
 orbotservice/src/main/res/values-pt-rBR/strings.xml | 2 +-
 orbotservice/src/main/res/values-ro/strings.xml | 2 +-
 orbotservice/src/main/res/values-si-rLK/strings.xml | 2

[tor-commits] [orbot/master] set pdnsd path dynamically, in case it is installed elsewhere

2018-05-11 Thread n8fr8

commit 456f8962f157065fdd291280b5cf58715bf0808d
Author: n8fr8 
Date:   Mon Apr 23 22:43:33 2018 -0400

set pdnsd path dynamically, in case it is installed elsewhere
---
 .../torproject/android/service/vpn/OrbotVpnManager.java| 14 --
 orbotservice/src/main/res/values/pdnsd.xml |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
 
b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
index e3927d5b..e19b8847 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
@@ -307,6 +307,7 @@ public class OrbotVpnManager implements Handler.Callback {
+ String.valueOf(mTorSocks);

final String localDNS = virtualGateway + ':' + 
"8091";//String.valueOf(TorServiceConstants.TOR_DNS_PORT_DEFAULT);
+   //final String localDNS = 
virtualGateway + ":" + DEFAULT_ACTUAL_DNS_PORT;
final boolean localDnsTransparentProxy = true;

builder.setMtu(VPN_MTU);
@@ -400,14 +401,15 @@ public class OrbotVpnManager implements Handler.Callback {
 
 }
 
+
 private void startDNS (String dns, int port) throws IOException, 
TimeoutException
 {
-   makePdnsdConf(mService, dns, port,filePdnsd.getParentFile() );
+
+   makePdnsdConf(mService, dns, port,filePdnsd.getParentFile());

 ArrayList customEnv = new ArrayList();
-   String baseDirectory = filePdnsd.getParent();
 
-String[] cmdString = {filePdnsd.getCanonicalPath(),"-c",baseDirectory 
+ "/pdnsd.conf"};
+String[] cmdString = 
{filePdnsd.getCanonicalPath(),"-c",filePdnsd.getParent() + "/pdnsd.conf"};
 ProcessBuilder pb = new ProcessBuilder(cmdString);
 pb.redirectErrorStream(true);
Process proc = pb.start();
@@ -429,8 +431,8 @@ public class OrbotVpnManager implements Handler.Callback {
 
 }
 
-public static void makePdnsdConf(Context context, String dns, int port, 
File fileDir) throws FileNotFoundException {
-String conf = String.format(context.getString(R.string.pdnsd_conf), 
dns, port);
+public static void makePdnsdConf(Context context, String dns, int port, 
File fileDir) throws FileNotFoundException, IOException {
+String conf = String.format(context.getString(R.string.pdnsd_conf), 
dns, port, fileDir.getCanonicalPath());
 
 File f = new File(fileDir,"pdnsd.conf");
 
@@ -452,7 +454,7 @@ public class OrbotVpnManager implements Handler.Callback {
 
 }
 }
-}
+   }
 
 
 }
diff --git a/orbotservice/src/main/res/values/pdnsd.xml 
b/orbotservice/src/main/res/values/pdnsd.xml
index a9ba34d7..4fd6d79e 100644
--- a/orbotservice/src/main/res/values/pdnsd.xml
+++ b/orbotservice/src/main/res/values/pdnsd.xml
@@ -3,7 +3,7 @@

 global {
perm_cache=0;
-   cache_dir="/data/data/org.torproject.android/app_bin";
+   cache_dir="%3$s";
server_port = 8091;
server_ip = 0.0.0.0;
query_method=udp_only;
@@ -11,7 +11,7 @@ global {
max_ttl=1w;
timeout=10;
daemon=on;
-   pid_file="/data/data/org.torproject.android/app_bin/pdnsd.pid";
+   pid_file="%3$s/pdnsd.pid";
 
 }
 



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

[tor-commits] [orbot/master] Merge branch 'master' of github.com:n8fr8/orbot

2018-05-11 Thread n8fr8

commit 6a911d9f824725bdeaeb545df898711a1bcfafe3
Merge: 456f8962 a94d2c98
Author: n8fr8 
Date:   Mon Apr 30 15:04:42 2018 -0400

Merge branch 'master' of github.com:n8fr8/orbot

 .../java/{net/freehaven/tor => org/torproject/android}/control/.cvsignore | 0
 .../java/{net/freehaven/tor => org/torproject/android}/control/Bytes.java | 0
 .../freehaven/tor => org/torproject/android}/control/ConfigEntry.java | 0
 .../freehaven/tor => org/torproject/android}/control/EventHandler.java| 0
 .../tor => org/torproject/android}/control/NullEventHandler.java  | 0
 .../freehaven/tor => org/torproject/android}/control/PasswordDigest.java  | 0
 .../java/{net/freehaven/tor => org/torproject/android}/control/README | 0
 .../tor => org/torproject/android}/control/TorControlCommands.java| 0
 .../tor => org/torproject/android}/control/TorControlConnection.java  | 0
 .../freehaven/tor => org/torproject/android}/control/TorControlError.java | 0
 .../tor => org/torproject/android}/control/TorControlSyntaxError.java | 0
 .../freehaven/tor => org/torproject/android}/control/examples/.cvsignore  | 0
 .../torproject/android}/control/examples/DebuggingEventHandler.java   | 0
 .../freehaven/tor => org/torproject/android}/control/examples/Main.java   | 0
 14 files changed, 0 insertions(+), 0 deletions(-)



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

[tor-commits] [orbot/master] adding new strings for onboarding

2018-05-11 Thread n8fr8

commit 8867c339e8f9046eaac60d5c6a05fa0217191153
Author: n8fr8 
Date:   Fri Apr 20 00:32:05 2018 -0400

adding new strings for onboarding
---
 app/src/main/res/values-ca/poestrings.xml | 39 +++
 app/src/main/res/values-de/poestrings.xml | 38 ++
 app/src/main/res/values-el/poestrings.xml | 39 +++
 app/src/main/res/values-en-rGB/poestrings.xml | 39 +++
 app/src/main/res/values-es-rAR/poestrings.xml | 38 ++
 app/src/main/res/values-es/poestrings.xml | 39 +++
 app/src/main/res/values-eu/poestrings.xml | 38 ++
 app/src/main/res/values-hi/poestrings.xml | 38 ++
 app/src/main/res/values-is/poestrings.xml | 39 +++
 app/src/main/res/values-it/poestrings.xml | 39 +++
 app/src/main/res/values-mk/poestrings.xml | 39 +++
 app/src/main/res/values-pt-rBR/poestrings.xml | 39 +++
 app/src/main/res/values-ru/poestrings.xml | 38 ++
 app/src/main/res/values-sv/poestrings.xml | 39 +++
 app/src/main/res/values-tr/poestrings.xml | 39 +++
 app/src/main/res/values-uk/poestrings.xml | 39 +++
 app/src/main/res/values-zh-rTW/poestrings.xml | 39 +++
 17 files changed, 658 insertions(+)

diff --git a/app/src/main/res/values-ca/poestrings.xml 
b/app/src/main/res/values-ca/poestrings.xml
new file mode 100644
index ..5d1e77a2
--- /dev/null
+++ b/app/src/main/res/values-ca/poestrings.xml
@@ -0,0 +1,39 @@
+
+
+Els ponts sÃ³n connexions de Tor que ajuden a 
evitar la censura. Pots provar els ponts si Tor estÃ  bloquejat pel teu 
proveÃ¯dor d\'internet, cada tipus de pont utilitza un mÃ¨tode diferent.
+per evitar la censura: Si un tipus no funciona, prova un altre.
+
+Sense ponts: Connecta directament amb 
Tor
+Ponts proveÃ¯ts:
+Ponts personalitzats
+
+ConfiguraciÃ³ dels ponts Tor
+Fet
+
+A vegades necessites un pont per accedir 
a Tor.
+MÃ©s informaciÃ³
+
+Podeu habilitar qualsevol aplicaciÃ³ perquÃ¨ usi 
el Tor mitjanÃ§ant la nostra VPN incorporada.
+No us anonimitzarÃ , perÃ² us ajudarÃ  a 
aconseguir-ho mitjanÃ§ant els tallafocs.
+Escull aplicacions
+
+Connectat!
+
+La nostra diversa comunitat Ã©s el que fa 
Tor genial!
+Cada dia la gent utilitza Tor per evitar 
ser perseguit per anuncis.
+Si bloquegen Facebook, la gent utilitza Tor 
per connectar amb els seus amics i famÃlia.
+Activistes utilitzen Tor per piular 
lliurement les seves opinions i creences.
+Bloguers utilitzen Tor congregar gent per a 
reformes socials.
+Periodistes utilitzen Tor per investigar 
segurs els seus reportatges.
+Gent de negocis utilitza Tor per mantenir 
les estratÃ¨gies de l\'empresa privades
+Treballadors utilitzen Tor per lluitar per 
la justÃcia sense por de perdre el seu treball
+
+Et connectem.\" = \"Et connectem.
+
+Hola
+Us donem la benvinguda al Tor.
+
+Navega internet com ho 
esperaries.
+Sense rastre. Sense censura.
+
+
diff --git a/app/src/main/res/values-de/poestrings.xml 
b/app/src/main/res/values-de/poestrings.xml
new file mode 100644
index ..6bed0225
--- /dev/null
+++ b/app/src/main/res/values-de/poestrings.xml
@@ -0,0 +1,38 @@
+
+
+BrÃ¼cken, sind Tor-Relais die helfen sollen, 
die Zensur zu umgehen. Sie kÃ¶nnen BrÃ¼cken nutzen, wenn Tor von Ihrem 
Internet-Anbieter blockiert wird; Jeder BrÃ¼ckentyp verwendet eine andere 
Methode, um Zensur zu vermeiden: Wenn ein Typ nicht funktioniert, versuchen Sie 
es mit einem anderen Typ.
+
+Keine BrÃ¼cken: Verbinde Direkt mit Tor
+Bereitgestellte BrÃ¼cken:
+Benutzerdefinierte BrÃ¼cken
+
+BrÃ¼cken-Konfiguration
+Fertig
+
+Manchmal wird eine BrÃ¼cke benÃ¶tigt, um 
auf das Tor Netzwerk zugreifen zu kÃ¶nnen.
+ERZÃHL MIR MEHR
+
+Sie kÃ¶nnen jede App aktivieren, um mit dem 
integrierten VPN-Tunnel, alles durch Tor zu leiten.
+Es macht dich nicht Anonym, aber es wird Dir 
helfen, durch Firewalls hindurch zu kommen.
+WÃHLE APPS
+
+Verbunden!
+
+Unsere vielfÃ¤ltige Community macht Tor 
groÃartig!
+Menschen verwenden tÃ¤glich Tor, um zu 
vermeiden, dass sie aufgrund von Marketingzwecken verfolgt werden.
+Wenn Facebook blockiert ist, verwenden die 
Menschen Tor, um sich mit ihren Freunden und ihrer Familie zu 
verbinden.
+Aktivisten nutzen Tor, um ihre Meinungen 
und Ãberzeugungen frei zu Twittern.
+Blogger nutzen Tor, um Menschen fÃ¼r 
soziale Reformen zu gewinnen.
+Journalisten verwenden Tor, um 
Investigativ-Stories auf sichere Weise, zu verÃ¶ffentlichen.
+GeschÃ¤ftsleute nutzen Tor, um ihre 
Unternehmensstrategien Privat zu halten.
+

[tor-commits] [orbot/master] switch to 1.1.1.1 for default DNS

2018-05-11 Thread n8fr8

commit bae861e3b3a7eaa1eb416e19dc1ba9e02a68f33f
Author: n8fr8 
Date:   Fri Apr 20 00:10:56 2018 -0400

switch to 1.1.1.1 for default DNS
---
 .../main/java/org/torproject/android/service/vpn/OrbotVpnManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
 
b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
index bbae15ea..e3927d5b 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
@@ -300,7 +300,7 @@ public class OrbotVpnManager implements Handler.Callback {
final String virtualGateway = "10.10.10.1";
final String virtualIP = "10.10.10.2";
final String virtualNetMask = "255.255.255.0";
-   final String dummyDNS = "8.8.8.8"; //this is 
intercepted by the tun2socks library, but we must put in a valid DNS to start
+   final String dummyDNS = "1.1.1.1"; //this is 
intercepted by the tun2socks library, but we must put in a valid DNS to start
final String defaultRoute = "0.0.0.0";

final String localSocks = localhost + ':'



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

[tor-commits] [orbot/master] update localized strings

2018-05-11 Thread n8fr8

commit a66ff47177edf03be037f88b35dfd596d17d9419
Author: n8fr8 
Date:   Fri Apr 20 00:26:15 2018 -0400

update localized strings
---
 app/src/main/res/values-th/poestrings.xml |  39 
 app/src/main/res/values-th/strings.xml| 312 --
 description/th.xlf|  18 ++
 3 files changed, 308 insertions(+), 61 deletions(-)

diff --git a/app/src/main/res/values-th/poestrings.xml 
b/app/src/main/res/values-th/poestrings.xml
new file mode 100644
index ..3a4f25ae
--- /dev/null
+++ b/app/src/main/res/values-th/poestrings.xml
@@ -0,0 +1,39 @@
+
+
+\"Bridges à¸à¸·à¸à¸£à¸µà¹à¸¥à¸¢à¹à¸à¸à¸ 
Tor 
à¸à¸µà¹à¸à¹à¸§à¸¢à¹à¸«à¸¥à¸·à¸à¸à¸²à¸£à¸«à¸¥à¸à¹à¸¥à¸µà¹à¸¢à¸à¸à¸²à¸£à¸à¸´à¸à¸à¸±à¹à¸
 à¸à¸¸à¸à¸ªà¸²à¸¡à¸²à¸£à¸à¸¥à¸à¸à¹à¸à¹ Bridges à¸«à¸²à¸ Tor 
à¸à¸¹à¸à¸à¸¥à¹à¸à¸à¹à¸à¸¢ ISP à¸à¸à¸à¸à¸¸à¸; Bridges 
à¹à¸à¹à¸¥à¸°à¸à¸à¸´à¸à¹à¸à¹à¸§à¸´à¸à¸µà¸à¸²à¸£à¸à¸µà¹à¹à¸à¸à¸à¹à¸²à¸à¸à¸±à¸
+ à¹à¸à¸·à¹à¸à¸«à¸¥à¸à¹à¸¥à¸µà¹à¸¢à¸à¸à¸²à¸£à¸à¸´à¸à¸à¸±à¹à¸: 
à¸«à¸²à¸à¸§à¸´à¸à¸µà¸à¸²à¸£à¸«à¸à¸¶à¹à¸à¹à¸¡à¹à¹à¸à¹à¸à¸¥ 
à¸à¹à¸à¸°à¸¥à¸à¸à¹à¸à¹à¸§à¸´à¸à¸µà¸à¸²à¸£à¸à¸·à¹à¸
+
+à¹à¸¡à¹à¸¡à¸µ Bridges: 
à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸à¹à¸à¸¢à¸à¸£à¸à¸à¸±à¸ Tor
+Bridges à¸à¸µà¹à¸¡à¸µà¹à¸«à¹:
+Bridges 
à¸à¸µà¹à¸à¸£à¸±à¸à¹à¸à¹à¸à¹à¸à¸à¸²à¸°
+
+à¸à¸²à¸£à¸à¸³à¸«à¸à¸à¸à¹à¸²à¸à¸à¸ 
Bridges
+à¹à¸ªà¸£à¹à¸
+
+à¸à¸²à¸à¸à¸£à¸±à¹à¸à¸à¸¸à¸à¸à¸²à¸à¸à¹à¸à¸à¸à¸²à¸£
 Bridges à¹à¸à¸·à¹à¸à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸à¸à¸±à¸ Tor
+à¸à¸à¸à¸£à¸²à¸¢à¸¥à¸°à¹à¸à¸µà¸¢à¸à¹à¸à¸´à¹à¸¡à¹à¸à¸´à¸¡à¸à¸±à¸à¸à¸±à¸
+
+à¸à¸¸à¸à¸ªà¸²à¸¡à¸²à¸£à¸à¹à¸à¸´à¸à¹à¸à¹à¸à¸²à¸à¹à¸à¸à¹à¸à¹
 à¸à¹à¸²à¸ Tor à¹à¸à¸¢à¹à¸à¹ VPN 
à¹à¸à¸à¸±à¸§à¸à¸à¸à¹à¸£à¸²
+à¸à¸²à¸£à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£à¸à¸µà¹à¸à¸°à¹à¸¡à¹\à¹à¸à¹à¸à¸³à¹à¸«à¹à¹à¸¡à¹à¸¡à¸µà¸à¸²à¸£à¸£à¸°à¸à¸¸à¸à¸±à¸§à¸à¸à¸à¸à¸à¸à¸¸à¸
 
à¹à¸à¹à¸à¸°à¹à¸à¹à¸à¸à¸²à¸£à¸à¸³à¹à¸«à¹à¸à¹à¸²à¸à¹à¸à¸£à¹à¸§à¸à¸¥à¸¥à¹à¹à¸à¹
+à¹à¸¥à¸·à¸à¸à¹à¸à¸
+
+à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸à¹à¸¥à¹à¸§!
+
+à¸à¹à¸§à¸¢à¸à¸§à¸²à¸¡à¸«à¸¥à¸²à¸à¸«à¸¥à¸²à¸¢à¸à¸à¸à¸à¸¸à¸¡à¸à¸à¸à¸à¸à¹à¸£à¸²à¹à¸à¹à¸à¸ªà¸´à¹à¸à¸à¸µà¹à¸à¸³à¹à¸«à¹
 Tor à¸à¸±à¹à¸à¸¢à¸à¸à¹à¸¢à¸µà¹à¸¢à¸¡!
+à¸à¸¸à¸à¸§à¸±à¸à¸à¸µà¹à¸à¸¹à¹à¸à¸à¹à¸à¹ Tor 
à¹à¸à¸·à¹à¸à¸«à¸¥à¸µà¸à¹à¸¥à¸µà¹à¸¢à¸à¸à¸²à¸£à¸à¸¹à¸à¸à¸´à¸à¸à¸²à¸¡à¸à¸²à¸à¹à¸à¸©à¸à¸²à¸à¸²à¸à¸à¸²à¸£à¸à¸¥à¸²à¸
+à¹à¸¡à¸·à¹à¸ Facebook 
à¸à¸¹à¸à¸à¸´à¸à¸à¸±à¹à¸ à¸à¸¹à¹à¸à¸à¸à¸°à¹à¸à¹ Tor 
à¹à¸à¸·à¹à¸à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸à¸à¸±à¸à¹à¸à¸·à¹à¸à¸à¹à¸¥à¸°à¸à¸£à¸à¸à¸à¸£à¸±à¸§à¸à¸à¸à¸à¸§à¸à¹à¸à¸²
+à¹à¸«à¸¥à¹à¸²à¸à¸±à¸à¹à¸à¸¥à¸·à¹à¸à¸à¹à¸«à¸§à¹à¸à¹
 Tor 
à¹à¸à¸·à¹à¸à¸à¸§à¸µà¸à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸à¹à¸¥à¸°à¸à¸§à¸²à¸¡à¹à¸à¸·à¹à¸à¸à¸à¸à¸à¸§à¸à¹à¸à¸²à¸à¸¢à¹à¸²à¸à¹à¸ªà¸£à¸µ
+à¸à¸¥à¹à¸à¸à¹à¸à¸à¸£à¹à¹à¸à¹ Tor 
à¹à¸à¸à¸²à¸£à¸£à¸°à¸à¸¡à¸à¸¹à¹à¸à¸à¹à¸à¸·à¹à¸à¸à¸²à¸£à¸à¸à¸´à¸£à¸¹à¸à¸ªà¸±à¸à¸à¸¡
+ 
à¸à¸±à¸à¸ªà¸·à¹à¸à¸¡à¸§à¸¥à¸à¸à¹à¸à¹ Tor 
à¹à¸à¸·à¹à¸à¸ªà¸·à¸à¸ªà¸§à¸à¹à¸£à¸·à¹à¸à¸à¸£à¸²à¸§à¸à¸µà¹à¸à¸§à¸à¹à¸à¸²à¸£à¸²à¸¢à¸à¸²à¸à¸à¸¢à¸¹à¹à¸à¸¢à¹à¸²à¸à¸à¸¥à¸à¸à¸
 à¸±à¸¢
+à¸à¸±à¸à¸à¸¸à¸£à¸à¸´à¸à¹à¸à¹ Tor 
à¹à¸à¸·à¹à¸à¸£à¸±à¸à¸©à¸²à¸à¸¥à¸¢à¸¸à¸à¸à¹à¸à¸à¸à¸à¸£à¸´à¸©à¸±à¸à¹à¸«à¹à¹à¸à¹à¸à¸à¸§à¸²à¸¡à¸¥à¸±à¸
+à¸à¸¹à¹à¹à¸à¹à¹à¸£à¸à¸à¸²à¸à¹à¸à¹ Tor 
à¹à¸à¸à¸²à¸£à¸à¹à¸à¸ªà¸¹à¹à¹à¸à¸·à¹à¸à¸à¸§à¸²à¸¡à¸¢à¸¸à¸à¸´à¸à¸£à¸£à¸¡à¹à¸à¸¢à¹à¸¡à¹à¹à¸à¸£à¸à¸à¸¥à¸±à¸§à¸§à¹à¸²à¸à¸°à¸à¸à¸à¸²à¸
+
+à¹à¸£à¸²à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸à¸à¸±à¸à¸à¸¸à¸\"
 = \"à¹à¸£à¸²à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸à¸à¸±à¸à¸à¸¸à¸
+
+à¸ªà¸§à¸±à¸ªà¸à¸µ
+à¸à¸à¸à¹à¸à¸à¸£à¸±à¸à¸ªà¸¹à¹ Tor 
à¸à¸à¸¡à¸·à¸à¸à¸·à¸
+
+à¹à¸à¹à¸²à¸à¸¹à¸à¸´à¸à¹à¸à¸à¸£à¹à¹à¸à¹à¸à¹à¸à¹à¹à¸à¹à¸à¸à¸à¸µà¹à¸à¸¸à¸à¸à¸²à¸à¸«à¸§à¸±à¸
+à¹à¸¡à¹à¸¡à¸µà¸à¸²à¸£à¸à¸´à¸à¸à¸²à¸¡ 
à¹à¸¡à¹à¸¡à¸µà¸à¸²à¸£à¸à¸´à¸à¸à¸±à¹à¸
+
+
diff --git a/app/src/main/res/values-th/strings.xml 
b/app/src/main/res/values-th/strings.xml
index d73cfbe4..43ec54ad 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -1,44 +1,56 @@
-
+
 
   Orbot
+  Orbot 
à¸à¸·à¸à¹à¸à¸à¸à¸£à¹à¸à¸à¸à¸µà¸à¸£à¸µà¸à¸µà¹à¸à¹à¸§à¸¢à¹à¸à¸´à¹à¸¡à¸à¸£à¸°à¸ªà¸´à¸à¸à¸´à¸
 à¸²à¸à¹à¸«à¹à¸à¸±à¸à¹à¸à¸à¸à¸·à¹à¸à¹ 
à¹à¸«à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¹à¸à¹à¸à¸²à¸à¸à¸´à¸à¹à¸à¸à¸£à¹à¹à¸à¹à¸à¹à¸à¹à¸à¸¢à¹à¸²à¸à¸à¸¥à¸à¸à¸
 à¸±à¸¢à¸¡à¸²à¸à¸à¸¶à¹à¸ Orbot à¹à¸à¹ Tor

[tor-commits] [orbot/master] Merge pull request #141 from bitmold/no-phone-state-perm

2018-05-11 Thread n8fr8

commit d1daf86cd177bf3bb2cf07be8c85946c2884e092
Merge: d0cc453d 505223b3
Author: Nathan Freitas 
Date:   Fri Apr 20 00:12:26 2018 -0400

Merge pull request #141 from bitmold/no-phone-state-perm

removed legacy READ_PHONE_STATE perm

 app/src/fullperm/AndroidManifest.xml | 1 -
 docs/WALKTHROUGH | 5 -
 2 files changed, 6 deletions(-)



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

[tor-commits] [orbot/master] Merge pull request #139 from bitmold/back-closes-log-not-app

2018-05-11 Thread n8fr8

commit fdd6b52f56ede35671cedcee38e462a1a5d60777
Merge: f151b37c 87401d04
Author: Nathan Freitas 
Date:   Fri Apr 20 00:13:44 2018 -0400

Merge pull request #139 from bitmold/back-closes-log-not-app

When the Tor log is open, pressing back will close it instead of Orbot

 .../java/org/torproject/android/OrbotMainActivity.java   | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)




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

[tor-commits] [orbot/master] Merge pull request #135 from bitmold/prefs-improvements

2018-05-11 Thread n8fr8

commit e0293ac96eadcc17d68230334d2615eb3794a98b
Merge: fdd6b52f 13ea11d7
Author: Nathan Freitas 
Date:   Fri Apr 20 00:16:46 2018 -0400

Merge pull request #135 from bitmold/prefs-improvements

Settings UI Improvements

 .../android/settings/SettingsPreferences.java  |  24 +-
 app/src/main/res/values/strings.xml|   4 +-
 app/src/main/res/xml/preferences.xml   | 538 +++--
 3 files changed, 281 insertions(+), 285 deletions(-)




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

[tor-commits] [orbot/master] Merge pull request #143 from bitmold/app-sorting-case-insensitive

2018-05-11 Thread n8fr8

commit d0cc453d5e1e82df48728dd5f983e73497677188
Merge: e244df96 1c9afcba
Author: Nathan Freitas 
Date:   Fri Apr 20 00:12:05 2018 -0400

Merge pull request #143 from bitmold/app-sorting-case-insensitive

App sorting for TorifiedApps is case sensitive

 .../main/java/org/torproject/android/ui/AppManagerActivity.java| 7 ++-
 .../main/java/org/torproject/android/service/vpn/TorifiedApp.java  | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)



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

[tor-commits] [orbot/master] removed legacy READ_PHONE_STATE perm

2018-05-11 Thread n8fr8

commit 505223b3a1894588de0802669b3269a89edeb4b1
Author: lexi 
Date:   Thu Apr 12 13:29:22 2018 -0400

removed legacy READ_PHONE_STATE perm
---
 app/src/fullperm/AndroidManifest.xml | 1 -
 docs/WALKTHROUGH | 5 -
 2 files changed, 6 deletions(-)

diff --git a/app/src/fullperm/AndroidManifest.xml 
b/app/src/fullperm/AndroidManifest.xml
index c3c5f8f6..d2497e4c 100644
--- a/app/src/fullperm/AndroidManifest.xml
+++ b/app/src/fullperm/AndroidManifest.xml
@@ -14,7 +14,6 @@
 
 
 
-
 
 
-// BTW, this shows up as a fairly unintrusive type 
perm request now in Android / in older versions (1.6 and earlier)
-// it was reported "as read / monitor phone state" and 
paranoid Tor-types didn't like the idea of it
-// in 1.6+ it has a much better UX in terms of having 
a more granular permisions around boot since it is a very
-// common request - ah , that's awesome, i think i 
remember seeing sth of this sorts when i was going through the guardianproject 
mailing list. iirc this is something ioerror wanted
-
 
 âââ OrbotMainActivity.java
 //our wonderful main activity!



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

[tor-commits] [orbot/master] toUpperCase -> compareToIgnoreCase

2018-05-11 Thread n8fr8

commit 1c9afcbafe898779fb91483fe32851e850d605b9
Author: lexi 
Date:   Fri Apr 13 14:55:28 2018 -0400

toUpperCase -> compareToIgnoreCase
---
 app/src/main/java/org/torproject/android/ui/AppManagerActivity.java | 2 +-
 .../src/main/java/org/torproject/android/service/vpn/TorifiedApp.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java 
b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
index 17e39ccd..2f60a40c 100644
--- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
@@ -135,7 +135,7 @@ public class AppManagerActivity extends AppCompatActivity 
implements OnClickList
would likely not expect to find them.
  */
 if (o1.isTorified() == o2.isTorified())
-return 
o1.getName().toUpperCase().compareTo(o2.getName().toUpperCase());
+return o1.getName().compareToIgnoreCase(o2.getName());
 if (o1.isTorified()) return -1;
 return 1;
 }
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java
 
b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java
index 1276f2f6..cb60e442 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java
@@ -133,7 +133,7 @@ public class TorifiedApp implements Comparable {

@Override
public int compareTo(Object another) {
-   return 
this.toString().toUpperCase().compareTo(another.toString().toUpperCase());
+   return this.toString().compareToIgnoreCase(another.toString());
}

@Override



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

[tor-commits] [orbot/master] Merge pull request #137 from bitmold/patch-3

2018-05-11 Thread n8fr8

commit a4ce29db63338b0873dae82b111980e815aa4dff
Merge: d681dced ca3856ce
Author: Nathan Freitas 
Date:   Mon Apr 2 09:20:04 2018 -0400

Merge pull request #137 from bitmold/patch-3

Update BUILD

 BUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



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

[tor-commits] [orbot/master] App sorting for TorifiedApps is case insensitive

2018-05-11 Thread n8fr8

commit 0675600505843058fd2aa6a4425b0f0ebb660808
Author: lexi 
Date:   Fri Apr 13 14:10:02 2018 -0400

App sorting for TorifiedApps is case insensitive
---
 .../main/java/org/torproject/android/ui/AppManagerActivity.java| 7 ++-
 .../main/java/org/torproject/android/service/vpn/TorifiedApp.java  | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java 
b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
index c3cdc5eb..17e39ccd 100644
--- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
@@ -130,7 +130,12 @@ public class AppManagerActivity extends AppCompatActivity 
implements OnClickList
 
 Collections.sort(mApps,new Comparator() {
 public int compare(TorifiedApp o1, TorifiedApp o2) {
-if (o1.isTorified() == o2.isTorified()) return 
o1.getName().compareTo(o2.getName());
+/* Some apps start with lowercase letters and without the 
sorting being case
+   insensitive they'd appear at the end of the grid of apps, a 
position where users
+   would likely not expect to find them.
+ */
+if (o1.isTorified() == o2.isTorified())
+return 
o1.getName().toUpperCase().compareTo(o2.getName().toUpperCase());
 if (o1.isTorified()) return -1;
 return 1;
 }
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java
 
b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java
index c72ebe3b..1276f2f6 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java
@@ -133,8 +133,7 @@ public class TorifiedApp implements Comparable {

@Override
public int compareTo(Object another) {
-   
-   return this.toString().compareTo(another.toString());
+   return 
this.toString().toUpperCase().compareTo(another.toString().toUpperCase());
}

@Override



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

[tor-commits] [orbot/master] Merge branch 'master' of github.com:n8fr8/orbot

2018-05-11 Thread n8fr8

commit e244df96affd48c32a5e91ccd097a2b1571db051
Merge: bae861e3 a4ce29db
Author: n8fr8 
Date:   Fri Apr 20 00:11:38 2018 -0400

Merge branch 'master' of github.com:n8fr8/orbot

 BUILD  |  4 +++
 INSTALL|  2 +-
 .../torproject/android/ui/AppManagerActivity.java  | 17 +--
 app/src/main/res/layout/layout_apps.xml| 19 
 app/src/main/res/layout/layout_apps_item.xml   | 34 +-
 5 files changed, 52 insertions(+), 24 deletions(-)



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

[tor-commits] [orbot/master] Merge pull request #129 from bitmold/patch-2

2018-05-11 Thread n8fr8

commit 923be64f633ff62c90c11904fe9533b221387b44
Merge: d1daf86c 47e05343
Author: Nathan Freitas 
Date:   Fri Apr 20 00:12:47 2018 -0400

Merge pull request #129 from bitmold/patch-2

Removed Outdated FAQ in README

 README | 1 -
 1 file changed, 1 deletion(-)



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

[tor-commits] [orbot/master] update dependency command

2018-05-11 Thread n8fr8

commit 66783998a2cce93178c8d16f9e91935fcf119ee1
Author: n8fr8 
Date:   Sat Apr 21 23:28:58 2018 -0400

update dependency command
---
 orbotservice/build.gradle | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
index 793d088d..c5e113fe 100644
--- a/orbotservice/build.gradle
+++ b/orbotservice/build.gradle
@@ -27,10 +27,10 @@ android {
 }
 
 dependencies {
-compile project(':jsocksAndroid')
-compile 'org.torproject:tor-android-binary:0.3.1.9b'
-compile 'com.android.support:appcompat-v7:27.1.1'
-compile 'com.jrummyapps:android-shell:1.0.1'
-compile fileTree(dir: 'libs', include: ['*.jar','*.so'])
-testCompile 'junit:junit:4.12'
+implementation project(':jsocksAndroid')
+implementation 'org.torproject:tor-android-binary:0.3.2.10'
+implementation 'com.android.support:appcompat-v7:27.1.1'
+implementation 'com.jrummyapps:android-shell:1.0.1'
+implementation fileTree(dir: 'libs', include: ['*.jar','*.so'])
+testImplementation 'junit:junit:4.12'
 }



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

[tor-commits] [orbot/master] update gradle, SDK, dependencies, etc

2018-05-11 Thread n8fr8

commit f2c3753a0a41047e9b68dae747ffdb3d4b0a7023
Author: n8fr8 
Date:   Fri Apr 20 00:09:40 2018 -0400

update gradle, SDK, dependencies, etc
---
 app/build.gradle   | 25 +
 build.gradle   |  2 +-
 jsocksAndroid/build.gradle |  8 
 orbotservice/build.gradle  |  8 
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e5c8fe65..38d1a6d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-compileSdkVersion 26
-buildToolsVersion '26.0.2'
+compileSdkVersion 27
+buildToolsVersion '27.0.3'
 defaultConfig {
 applicationId "org.torproject.android"
 minSdkVersion 16
-targetSdkVersion 26
+targetSdkVersion 27
 }
 lintOptions {
 checkReleaseBuilds false
@@ -24,6 +24,7 @@ android {
 flavorDimensions "free"
 
 productFlavors {
+/**
 minimalperm {
 dimension "free"
 minSdkVersion 16
@@ -32,24 +33,24 @@ android {
 maxSdkVersion 23
 versionCode 1610
 versionName '16.0.0-RC-2-multi-SDK16'
-}
+}**/
 fullperm {
 dimension "free"
-minSdkVersion 23
+minSdkVersion 16
 applicationId 'org.torproject.android'
-targetSdkVersion 26
+targetSdkVersion 27
 versionCode 1611
-versionName '16.0.0-RC-2-multi-SDK23'
+versionName '16.0.0-RC-2-multi-SDK16'
 }
 }
 }
 
 dependencies {
-implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+implementation 'com.android.support.constraint:constraint-layout:1.1.0'
 compile project(':orbotservice')
-compile 'com.android.support:design:26.1.0'
-compile 'pl.bclogic:pulsator4droid:1.0.3'
-compile 'com.github.apl-devs:appintro:v4.2.2'
-compile 'com.github.javiersantos:AppUpdater:2.6.4'
+implementation 'com.android.support:design:27.1.1'
+implementation 'pl.bclogic:pulsator4droid:1.0.3'
+implementation 'com.github.apl-devs:appintro:v4.2.2'
+implementation 'com.github.javiersantos:AppUpdater:2.6.4'
 
 }
diff --git a/build.gradle b/build.gradle
index ea835f91..8964b5f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 google()
 }
 dependencies {
-classpath 'com.android.tools.build:gradle:3.0.1'
+classpath 'com.android.tools.build:gradle:3.1.1'
 }
 }
 
diff --git a/jsocksAndroid/build.gradle b/jsocksAndroid/build.gradle
index 12c743fd..7ac21e4e 100644
--- a/jsocksAndroid/build.gradle
+++ b/jsocksAndroid/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-compileSdkVersion 25
-buildToolsVersion '26.0.2'
+compileSdkVersion 27
+buildToolsVersion '27.0.3'
 
 defaultConfig {
-minSdkVersion 8
-targetSdkVersion 25
+minSdkVersion 16
+targetSdkVersion 27
 }
 
 buildTypes {
diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
index d950d865..793d088d 100644
--- a/orbotservice/build.gradle
+++ b/orbotservice/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 
 android {
-compileSdkVersion 26
-buildToolsVersion '26.0.2'
+compileSdkVersion 27
+buildToolsVersion '27.0.3'
 
 sourceSets {
 main {
@@ -13,7 +13,7 @@ android {
 
 defaultConfig {
 minSdkVersion 16
-targetSdkVersion 26
+targetSdkVersion 27
 versionCode 1
 versionName "1.0"
 
@@ -29,7 +29,7 @@ android {
 dependencies {
 compile project(':jsocksAndroid')
 compile 'org.torproject:tor-android-binary:0.3.1.9b'
-compile 'com.android.support:appcompat-v7:26.1.0'
+compile 'com.android.support:appcompat-v7:27.1.1'
 compile 'com.jrummyapps:android-shell:1.0.1'
 compile fileTree(dir: 'libs', include: ['*.jar','*.so'])
 testCompile 'junit:junit:4.12'



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

[tor-commits] [orbot/master] improve how service starts happen on Android O+

2018-05-11 Thread n8fr8

commit 3e8a92ac9c687d8164666afec91a268bfb0739c3
Author: n8fr8 
Date:   Tue May 1 23:56:20 2018 -0400

improve how service starts happen on Android O+
---
 app/src/main/java/org/torproject/android/OnBootReceiver.java   | 10 +-
 .../java/org/torproject/android/vpn/VPNEnableActivity.java |  9 -
 .../java/org/torproject/android/service/StartTorReceiver.java  |  9 -
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OnBootReceiver.java 
b/app/src/main/java/org/torproject/android/OnBootReceiver.java
index f915a201..21984952 100644
--- a/app/src/main/java/org/torproject/android/OnBootReceiver.java
+++ b/app/src/main/java/org/torproject/android/OnBootReceiver.java
@@ -4,6 +4,7 @@ package org.torproject.android;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 
 import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.TorService;
@@ -33,6 +34,7 @@ public class OnBootReceiver extends BroadcastReceiver {
   Intent intent = new Intent(context,VPNEnableActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent);
+
}
 
private void startService (String action, Context context)
@@ -40,7 +42,13 @@ public class OnBootReceiver extends BroadcastReceiver {

Intent torService = new Intent(context, TorService.class);
torService.setAction(action);
-   context.startService(torService);
+   if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+   context.startForegroundService(torService);
+   }
+   else
+   {
+   context.startService(torService);
+   }
 
}

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 c6de072e..551f2e62 100644
--- a/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java
+++ b/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java
@@ -12,6 +12,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.VpnService;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
@@ -122,7 +123,13 @@ public class VPNEnableActivity extends AppCompatActivity {
private void sendIntentToService(String action) {
Intent torService = new Intent(this, TorService.class); 
   
torService.setAction(action);
-   startService(torService);
+   if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+   startForegroundService(torService);
+   }
+   else
+   {
+   startService(torService);
+   }
 
 
}
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java
 
b/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java
index 2b0ebf89..0876174b 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java
@@ -4,6 +4,7 @@ package org.torproject.android.service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.text.TextUtils;
 
 import org.torproject.android.service.util.Prefs;
@@ -23,7 +24,13 @@ public class StartTorReceiver extends BroadcastReceiver 
implements TorServiceCon
 startTorIntent.setAction(action);
 if (packageName != null)
 startTorIntent.putExtra(EXTRA_PACKAGE_NAME, packageName);
-context.startService(startTorIntent);
+if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+context.startForegroundService(startTorIntent);
+}
+else
+{
+context.startService(startTorIntent);
+}
 } else if (!TextUtils.isEmpty(packageName)) {
 // let the requesting app know that the user has disabled
 // starting via Intent



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

[tor-commits] [orbot/master] change how we look up the version of tor being used

2018-05-11 Thread n8fr8

commit e903ea9a312b039fd3a864ae2ed9e84ffe05273a
Author: n8fr8 
Date:   Sat Apr 21 23:29:10 2018 -0400

change how we look up the version of tor being used
---
 app/src/main/java/org/torproject/android/OrbotMainActivity.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 13891219..06a2c4bd 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -92,7 +92,6 @@ import com.google.zxing.integration.android.IntentResult;
 import pl.bclogic.pulsator4droid.library.PulsatorLayout;
 
 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 {
@@ -499,7 +498,7 @@ public class OrbotMainActivity extends AppCompatActivity
 String version = "";
 
 try {
-version = getPackageManager().getPackageInfo(getPackageName(), 
0).versionName + " (Tor " + BINARY_TOR_VERSION + ")";
+version = getPackageManager().getPackageInfo(getPackageName(), 
0).versionName + " (Tor " + TorService.TOR_VERSION + ")";
 } catch (NameNotFoundException e) {
 version = "Version Not Found";
 }
@@ -1161,7 +1160,7 @@ public class OrbotMainActivity extends AppCompatActivity
 } else if (torStatus == TorServiceConstants.STATUS_OFF) {
 
 imgStatus.setImageResource(R.drawable.toroff);
-lblStatus.setText("Tor v" + BINARY_TOR_VERSION);
+lblStatus.setText("Tor v" + TorService.TOR_VERSION);
mBtnStart.setText(R.string.menu_start);
 mPulsator.start();
 



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

[tor-commits] [orbot/master] Merge pull request #126 from bitmold/vpn-app-selection-ui-improvements

2018-05-11 Thread n8fr8

commit d681dcedbfc73597bdd80b5a75e5bfc3c6a70409
Merge: c425f5fb 60307735
Author: Nathan Freitas 
Date:   Tue Mar 20 16:00:29 2018 -0400

Merge pull request #126 from bitmold/vpn-app-selection-ui-improvements

VPN App Selection UI Improvements

 .../torproject/android/ui/AppManagerActivity.java  | 17 +--
 app/src/main/res/layout/layout_apps.xml| 19 
 app/src/main/res/layout/layout_apps_item.xml   | 34 +-
 3 files changed, 47 insertions(+), 23 deletions(-)



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

[tor-commits] [orbot/master] gave the GridView some room to breath

2018-05-11 Thread n8fr8

commit a3f16974e7cfa79e51c0a9e850aa06fb777f669f
Author: lexi 
Date:   Mon Feb 26 14:29:24 2018 -0500

gave the GridView some room to breath
---
 app/src/main/res/layout/layout_apps.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/layout_apps.xml 
b/app/src/main/res/layout/layout_apps.xml
index 1be50435..bc35af99 100644
--- a/app/src/main/res/layout/layout_apps.xml
+++ b/app/src/main/res/layout/layout_apps.xml
@@ -19,7 +19,7 @@
 android:gravity="center"
 android:horizontalSpacing="5dp"
 android:numColumns="4"
-android:verticalSpacing="5dp">
+android:verticalSpacing="15dp">
 
 
 



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

[tor-commits] [orbot/master] formatted preferences.xml

2018-05-11 Thread n8fr8

commit db74f05efb38d2bfb80dcef2d767a7992e9e9758
Author: lexi 
Date:   Wed Mar 28 10:47:41 2018 -0400

formatted preferences.xml
---
 app/src/main/res/xml/preferences.xml | 532 ++-
 1 file changed, 267 insertions(+), 265 deletions(-)

diff --git a/app/src/main/res/xml/preferences.xml 
b/app/src/main/res/xml/preferences.xml
index 9e07f26f..7720b4cb 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,268 +1,270 @@
 http://schemas.android.com/apk/res/android;>
 
-
-
-
-
-
-
-
-
-
-
-
- 
- 
-
-
-
-
- 
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-  
-
-
-  
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 



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

[tor-commits] [orbot/master] Merge pull request #125 from bitmold/patch-1

2018-05-11 Thread n8fr8

commit eddcba62885f4ba1c35334a792022d5d4da06543
Merge: 64f90ed5 4b36bcef
Author: Nathan Freitas 
Date:   Tue Feb 27 15:05:58 2018 -0500

Merge pull request #125 from bitmold/patch-1

"Android" was used instead of "Orbot" in INSTALL

 INSTALL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



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

[tor-commits] [orbot/master] Fix BUILD instructions

2018-05-11 Thread n8fr8

commit 285373d276ed4cd2438059bb62013694a56ee72c
Author: goapunk 
Date:   Sat Mar 10 17:06:25 2018 +0100

Fix BUILD instructions
---
 BUILD | 4 
 1 file changed, 4 insertions(+)

diff --git a/BUILD b/BUILD
index 92a5f3bf..510cab32 100644
--- a/BUILD
+++ b/BUILD
@@ -23,6 +23,10 @@ You then need to run "ndk-build" from:

cd orbotservice/src/main
ndk-build
+   mkdir -p assets/armeabi
+   zip assets/armeabi/pdnsd.mp3 libs/armeabi/pdnsd
+   mkdir -p assets/x86
+   zip assets/x86/pdnsd.mp3 libs/armeabi/pdnsd
 
 This isn't enough though and we'll now sew up the binary into a small package
 that will handle basic Tor controlling features.



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

[tor-commits] [orbot/master] revert, pushed this to the wrong branch, sorry

2018-05-11 Thread n8fr8

commit 60307735480d3ba7db2dda7498a41e4a2762036c
Author: lexi 
Date:   Tue Mar 6 16:13:56 2018 -0500

revert, pushed this to the wrong branch, sorry
---
 app/src/main/res/values-nl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-nl/strings.xml 
b/app/src/main/res/values-nl/strings.xml
index d3d3cf53..1b2edbe7 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -277,7 +277,7 @@
   Bridges bijgewerkt
   Herstart Orbot om de 
wijzigingen in te schakelen
   QR-codes
-  Als
 je mobiele netwerk Tor actief blokkeert, kan je een \'bridge-server\' 
gebruiken als alternatieve toegang. SELECTEER een van de opties om te 
configureren en te testen...
+  Als
 je mobiele netwerk Tor actief blokkeert, kan je een \'bridge-server\' 
gebruiken als alternatieve toegang. SELECTEER een van de opties om te 
configureren en te testen..,.
   Bridge-modus
   E-mail
   Web



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

[tor-commits] [orbot/master] textPassword inputType for proxypasswd dialog

2018-05-11 Thread n8fr8

commit 49ee3aef4391da87c211dbc7bfda2c1e3f2e2d6d
Author: lexi 
Date:   Wed Mar 28 15:20:50 2018 -0400

textPassword inputType for proxypasswd dialog
---
 app/src/main/res/xml/preferences.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/xml/preferences.xml 
b/app/src/main/res/xml/preferences.xml
index e78017b9..3fd74394 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -218,6 +218,7 @@
 android:title="@string/pref_proxy_username_title" />
 
@@ -251,6 +252,7 @@
 
 



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

[tor-commits] [orbot/master] port settings use inputType=number

2018-05-11 Thread n8fr8

commit 8a141368e10df4c6ad75872df5d8e0b8a2addc07
Author: lexi 
Date:   Wed Mar 28 10:53:47 2018 -0400

port settings use inputType=number
---
 app/src/main/res/xml/preferences.xml | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/xml/preferences.xml 
b/app/src/main/res/xml/preferences.xml
index 7720b4cb..e78017b9 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -38,7 +38,7 @@
 android:defaultValue="en"
 android:key="pref_default_locale"
 android:summary="@string/set_locale_summary"
-android:title="@string/set_locale_title"/>
+android:title="@string/set_locale_title" />

[tor-commits] [orbot/master] Update BUILD

2018-05-11 Thread n8fr8

commit ca3856ce2b9584edcc9863d6011b9fbee9353c4f
Author: lex 
Date:   Sun Apr 1 18:25:21 2018 -0400

Update BUILD

x86 asset was under armeabi
---
 BUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BUILD b/BUILD
index 510cab32..bbbeaa8f 100644
--- a/BUILD
+++ b/BUILD
@@ -26,7 +26,7 @@ You then need to run "ndk-build" from:
mkdir -p assets/armeabi
zip assets/armeabi/pdnsd.mp3 libs/armeabi/pdnsd
mkdir -p assets/x86
-   zip assets/x86/pdnsd.mp3 libs/armeabi/pdnsd
+   zip assets/x86/pdnsd.mp3 libs/x86/pdnsd
 
 This isn't enough though and we'll now sew up the binary into a small package
 that will handle basic Tor controlling features.



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

[tor-commits] [orbot/master] Revert "Fix lost asset:"

2018-05-11 Thread n8fr8

commit 40391ba7ac490d8803e4b70efe8cbd401e866b8d
Author: goapunk 
Date:   Sat Mar 10 17:01:41 2018 +0100

Revert "Fix lost asset:"

This reverts commit 3b7aafd843f047988157220341970bd18f0beb42.
---
 orbotservice/src/main/jni/Android.mk | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/orbotservice/src/main/jni/Android.mk 
b/orbotservice/src/main/jni/Android.mk
index d7630409..c4448dbc 100644
--- a/orbotservice/src/main/jni/Android.mk
+++ b/orbotservice/src/main/jni/Android.mk
@@ -31,13 +31,6 @@ LOCAL_CFLAGS:= -Wall -O2 -I$(LOCAL_PATH)/pdnsd 
-DHAVE_STPCPY
 
 include $(BUILD_EXECUTABLE)
 
-.PHONY: $(CopyToAssets)
-
-CopyToAssets: libs/armeabi/pdnsd
-$(shell mkdir -p assets/armeabi)
-$(shell zip assets/armeabi/pdnsd.mp3 libs/armeabi/pdnsd)
-
-
 
 ## libancillary
 



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

[tor-commits] [orbot/master] cleanup

2018-05-11 Thread n8fr8

commit f117dac336f0d6943a5fb87bd55c4113942938c6
Author: lexi 
Date:   Wed Mar 28 15:21:18 2018 -0400

cleanup
---
 .../android/settings/SettingsPreferences.java  | 24 ++
 app/src/main/res/xml/preferences.xml   |  1 -
 2 files changed, 6 insertions(+), 19 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 d79055b4..fb01cde1 100644
--- a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
+++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
@@ -5,34 +5,26 @@ package org.torproject.android.settings;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
 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;
-
-
-public class SettingsPreferences 
-   extends PreferenceActivity  {
+public class SettingsPreferences
+extends PreferenceActivity {
 private static final String TAG = "SettingsPreferences";
 
-   private ListPreference prefLocale = null;
-   
+private ListPreference prefLocale = null;
+
 protected void onCreate(Bundle savedInstanceState) {
 super.onCreate(savedInstanceState);
 
 addPreferencesFromResource(R.xml.preferences);
 
getPreferenceManager().setSharedPreferencesMode(Context.MODE_MULTI_PROCESS);
-SharedPreferences prefs = 
TorServiceUtils.getSharedPrefs(getApplicationContext());
 
 prefLocale = (ListPreference) findPreference("pref_default_locale");
 Languages languages = Languages.get(this);
@@ -46,21 +38,17 @@ public class SettingsPreferences
 Prefs.setDefaultLocale(language);
 LocaleHelper.setLocale(getApplicationContext(), language);
 Intent intentResult = new Intent();
-intentResult.putExtra("locale",language);
-setResult(RESULT_OK,intentResult);
+intentResult.putExtra("locale", language);
+setResult(RESULT_OK, intentResult);
 finish();
 return false;
 }
 });
-
 }
 
-
 @Override
 protected void attachBaseContext(Context base) {
 super.attachBaseContext(LocaleHelper.onAttach(base));
 }
 
-
-
 }
diff --git a/app/src/main/res/xml/preferences.xml 
b/app/src/main/res/xml/preferences.xml
index 3fd74394..322db8f3 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -118,7 +118,6 @@
 android:title="@string/use_bridges" />
 
 https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] When log is open, the back btn closes it

2018-05-11 Thread n8fr8

commit 87401d04fe4072ae53c32c1a7c88a632bc120c86
Author: lexi 
Date:   Sat Apr 7 23:22:24 2018 -0400

When log is open, the back btn closes it
---
 .../java/org/torproject/android/OrbotMainActivity.java   | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index cbc7349e..1a2b177f 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -126,6 +126,8 @@ public class OrbotMainActivity extends AppCompatActivity
 private final static int REQUEST_SETTINGS = 0x9874;
 private final static int REQUEST_VPN_APPS_SELECT = 8889;
 
+private final static int LOG_DRAWER_GRAVITY = Gravity.END;
+
 // message types for mStatusUpdateHandler
 private final static int STATUS_UPDATE = 1;
 private static final int MESSAGE_TRAFFIC_COUNT = 2;
@@ -284,7 +286,7 @@ public class OrbotMainActivity extends AppCompatActivity
 lblStatus.setOnClickListener(new View.OnClickListener() {
 @Override
 public void onClick(View v) {
-mDrawer.openDrawer(Gravity.END);
+mDrawer.openDrawer(LOG_DRAWER_GRAVITY);
 }
 });
 
@@ -564,6 +566,18 @@ public class OrbotMainActivity extends AppCompatActivity
}
}
 
+
+@Override
+public void onBackPressed() {
+// check to see if the log is open, if so close it
+if (mDrawer.isDrawerOpen(LOG_DRAWER_GRAVITY)) {
+mDrawer.closeDrawers();
+}
+else {
+super.onBackPressed();
+}
+}
+
private void refreshVPNApps ()
 {
 stopVpnService();



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

[tor-commits] [orbot/master] Merge branch 'master' into vpn-app-selection-ui-improvements

2018-05-11 Thread n8fr8

commit e459ec0913f7735f957a7cde4abf5697127d96e5
Merge: a3f16974 eddcba62
Author: lexi 
Date:   Tue Feb 27 15:13:33 2018 -0500

Merge branch 'master' into vpn-app-selection-ui-improvements

 INSTALL  | 2 +-
 orbotservice/src/main/jni/Android.mk | 7 +++
 2 files changed, 8 insertions(+), 1 deletion(-)



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

[tor-commits] [orbot/master] Fix TextView overlap issues in app selection ui

2018-05-11 Thread n8fr8

commit ebc06ca3fe029edc01976b38b776c613f680198e
Author: lexi 
Date:   Mon Feb 26 14:18:25 2018 -0500

Fix TextView overlap issues in app selection ui
---
 .../torproject/android/ui/AppManagerActivity.java  |  1 +
 app/src/main/res/layout/layout_apps.xml|  4 ++-
 app/src/main/res/layout/layout_apps_item.xml   | 34 +-
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git 
a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java 
b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
index 6d29a85f..c3cdc5eb 100644
--- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
@@ -23,6 +23,7 @@ import android.content.SharedPreferences.Editor;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
diff --git a/app/src/main/res/layout/layout_apps.xml 
b/app/src/main/res/layout/layout_apps.xml
index e597163f..1be50435 100644
--- a/app/src/main/res/layout/layout_apps.xml
+++ b/app/src/main/res/layout/layout_apps.xml
@@ -17,7 +17,9 @@
 android:layout_height="match_parent"
 android:layout_alignParentTop="true"
 android:gravity="center"
-android:numColumns="4">
+android:horizontalSpacing="5dp"
+android:numColumns="4"
+android:verticalSpacing="5dp">
 
 
 
diff --git a/app/src/main/res/layout/layout_apps_item.xml 
b/app/src/main/res/layout/layout_apps_item.xml
index 83549121..ef188b3e 100644
--- a/app/src/main/res/layout/layout_apps_item.xml
+++ b/app/src/main/res/layout/layout_apps_item.xml
@@ -1,15 +1,33 @@
 
 
 http://schemas.android.com/apk/res/android;
-android:layout_width="120dp"
-android:layout_height="120dp"
-android:orientation="vertical"
+android:layout_width="90dp"
+android:layout_height="90dp"
 android:gravity="center_horizontal"
->
-
-
-
+android:orientation="vertical">
+
+
+
+
+
+
 
 
 



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

[tor-commits] [orbot/master] fixed typo in bridge line

2018-05-11 Thread n8fr8

commit c1a3a7d652f6bd7d6ef1cf74cafb3a58bc6a779e
Author: Nima Fatemi 
Date:   Sun Jan 14 15:30:59 2018 -0500

fixed typo in bridge line

added the lost space between url and front :)
---
 orbotservice/src/main/res/raw-fa/bridges.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/orbotservice/src/main/res/raw-fa/bridges.txt 
b/orbotservice/src/main/res/raw-fa/bridges.txt
index ef2f8838..50719db0 100644
--- a/orbotservice/src/main/res/raw-fa/bridges.txt
+++ b/orbotservice/src/main/res/raw-fa/bridges.txt
@@ -18,4 +18,4 @@ obfs4 154.35.22.12:4304 
00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXX
 obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D 
cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA 
iat-mode=0
 obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 
cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ 
iat-mode=1
 obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A 
cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA 
iat-mode=0
-meek_lite 0.0.2.0:1 5970E1B1020C70D8DE4001CD91D1136F104DD21A 
url=https://d3lg1tbpt4skql.cloudfront.net/front=a0.awstatic.com
+meek_lite 0.0.2.0:1 5970E1B1020C70D8DE4001CD91D1136F104DD21A 
url=https://d3lg1tbpt4skql.cloudfront.net/ front=a0.awstatic.com



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

[tor-commits] [orbot/master] Fix lost asset:

2018-05-11 Thread n8fr8

commit 3b7aafd843f047988157220341970bd18f0beb42
Author: goapunk 
Date:   Sun Feb 11 17:46:40 2018 +0100

Fix lost asset:

* Modify Android.mk to zip and move pdnsd to the assets folder

Signed-off-by: goapunk 
---
 orbotservice/src/main/jni/Android.mk | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/orbotservice/src/main/jni/Android.mk 
b/orbotservice/src/main/jni/Android.mk
index c4448dbc..d7630409 100644
--- a/orbotservice/src/main/jni/Android.mk
+++ b/orbotservice/src/main/jni/Android.mk
@@ -31,6 +31,13 @@ LOCAL_CFLAGS:= -Wall -O2 -I$(LOCAL_PATH)/pdnsd 
-DHAVE_STPCPY
 
 include $(BUILD_EXECUTABLE)
 
+.PHONY: $(CopyToAssets)
+
+CopyToAssets: libs/armeabi/pdnsd
+$(shell mkdir -p assets/armeabi)
+$(shell zip assets/armeabi/pdnsd.mp3 libs/armeabi/pdnsd)
+
+
 
 ## libancillary
 



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

[tor-commits] [orbot/master] update gradle to 4.4

2018-05-11 Thread n8fr8

commit 5d9fc75418261b3771ad5093424ec15dcba3c569
Author: n8fr8 
Date:   Fri Apr 20 00:10:00 2018 -0400

update gradle to 4.4
---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties 
b/gradle/wrapper/gradle-wrapper.properties
index c77faa60..72adb233 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 31 09:37:18 EDT 2017
+#Thu Apr 19 23:56:48 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip



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

[tor-commits] [orbot/master] Merge pull request #131 from goapunk/master

2018-05-11 Thread n8fr8

commit c425f5fb3446a32d2566dd21977b97535a3ea64d
Merge: eddcba62 285373d2
Author: Nathan Freitas 
Date:   Tue Mar 20 15:59:26 2018 -0400

Merge pull request #131 from goapunk/master

Revert "fix assets"

 BUILD| 4 
 orbotservice/src/main/jni/Android.mk | 7 ---
 2 files changed, 4 insertions(+), 7 deletions(-)



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

[tor-commits] [orbot/master] update preference summaries

2018-05-11 Thread n8fr8

commit 13ea11d7a8fddbdf07947c564c4976d61c1efc26
Author: lexi 
Date:   Wed Mar 28 15:26:57 2018 -0400

update preference summaries
---
 app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index f2f81e86..acc48dcc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -136,7 +136,7 @@
 Outbound Network Proxy (Optional)
 
 Outbound Proxy Type
-Protocol to use for proxy server: 
HTTP, HTTPS, Socks4, Socks5
+Protocol to use for proxy server: 
HTTP, HTTPS, SOCKS4, SOCKS5
 Enter Proxy Type
 
 Outbound Proxy Host
@@ -206,7 +206,7 @@
 enter localhost 
ports for hidden services
 Hidden Service Ports
 the
 addressable name for your hidden service (generated automatically)
-enable debug 
log to output (must use adb or aLogCat to view)
+Enable debug 
log to output (must use adb or aLogcat to view)
 Project Home(s): 
 https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/
 The Tor License



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

[tor-commits] [orbot/master] Merge pull request #124 from goapunk/fix_asset_pdnsd

2018-05-11 Thread n8fr8

commit 64f90ed5335d82336fd8c7cd48dbdd4b50aebe05
Merge: fb912d79 3b7aafd8
Author: Nathan Freitas 
Date:   Tue Feb 27 15:05:40 2018 -0500

Merge pull request #124 from goapunk/fix_asset_pdnsd

Fix lost asset:

 orbotservice/src/main/jni/Android.mk | 7 +++
 1 file changed, 7 insertions(+)



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

[tor-commits] [orbot/master] Wifi --> Wi-Fi

2018-05-11 Thread n8fr8

commit 8a16b2be82da06a80da7816cc82b8a17ba179fda
Author: lexi 
Date:   Tue Feb 27 13:10:36 2018 -0500

Wifi --> Wi-Fi
---
 app/src/main/res/values-az/strings.xml  | 2 +-
 app/src/main/res/values-bg/strings.xml  | 2 +-
 app/src/main/res/values-ca/strings.xml  | 2 +-
 app/src/main/res/values-cs-rCZ/strings.xml  | 2 +-
 app/src/main/res/values-da/strings.xml  | 2 +-
 app/src/main/res/values-el/strings.xml  | 2 +-
 app/src/main/res/values-es-rAR/strings.xml  | 2 +-
 app/src/main/res/values-es/strings.xml  | 2 +-
 app/src/main/res/values-et/strings.xml  | 2 +-
 app/src/main/res/values-eu/strings.xml  | 2 +-
 app/src/main/res/values-fi/strings.xml  | 2 +-
 app/src/main/res/values-gl/strings.xml  | 2 +-
 app/src/main/res/values-he/strings.xml  | 2 +-
 app/src/main/res/values-hr/strings.xml  | 2 +-
 app/src/main/res/values-hu/strings.xml  | 2 +-
 app/src/main/res/values-id/strings.xml  | 2 +-
 app/src/main/res/values-in-rID/strings.xml  | 2 +-
 app/src/main/res/values-is/strings.xml  | 2 +-
 app/src/main/res/values-it/strings.xml  | 2 +-
 app/src/main/res/values-ja/strings.xml  | 2 +-
 app/src/main/res/values-lv/strings.xml  | 2 +-
 app/src/main/res/values-mk/strings.xml  | 2 +-
 app/src/main/res/values-ms-rMY/strings.xml  | 2 +-
 app/src/main/res/values-ms/strings.xml  | 2 +-
 app/src/main/res/values-nl/strings.xml  | 2 +-
 app/src/main/res/values-pl/strings.xml  | 2 +-
 app/src/main/res/values-pt-rBR/strings.xml  | 2 +-
 app/src/main/res/values-ro/strings.xml  | 2 +-
 app/src/main/res/values-si-rLK/strings.xml  | 2 +-
 app/src/main/res/values-sk/strings.xml  | 2 +-
 app/src/main/res/values-sv/strings.xml  | 2 +-
 app/src/main/res/values-th/strings.xml  | 2 +-
 app/src/main/res/values-tl/strings.xml  | 2 +-
 app/src/main/res/values-vi/strings.xml  | 2 +-
 app/src/main/res/values-zh-rCN/strings.xml  | 2 +-
 app/src/main/res/values-zh-rTW/strings.xml  | 2 +-
 app/src/main/res/values/strings.xml | 4 ++--
 orbotservice/src/main/res/values-az/strings.xml | 2 +-
 orbotservice/src/main/res/values-bg/strings.xml | 2 +-
 orbotservice/src/main/res/values-ca/strings.xml | 2 +-
 orbotservice/src/main/res/values-cs-rCZ/strings.xml | 2 +-
 orbotservice/src/main/res/values-da/strings.xml | 2 +-
 orbotservice/src/main/res/values-el/strings.xml | 2 +-
 orbotservice/src/main/res/values-es/strings.xml | 2 +-
 orbotservice/src/main/res/values-et/strings.xml | 2 +-
 orbotservice/src/main/res/values-eu/strings.xml | 2 +-
 orbotservice/src/main/res/values-fi/strings.xml | 2 +-
 orbotservice/src/main/res/values-gl/strings.xml | 2 +-
 orbotservice/src/main/res/values-hr/strings.xml | 2 +-
 orbotservice/src/main/res/values-hu/strings.xml | 2 +-
 orbotservice/src/main/res/values-id/strings.xml | 2 +-
 orbotservice/src/main/res/values-in-rID/strings.xml | 2 +-
 orbotservice/src/main/res/values-is/strings.xml | 2 +-
 orbotservice/src/main/res/values-it/strings.xml | 2 +-
 orbotservice/src/main/res/values-ja/strings.xml | 2 +-
 orbotservice/src/main/res/values-lv/strings.xml | 2 +-
 orbotservice/src/main/res/values-mk/strings.xml | 2 +-
 orbotservice/src/main/res/values-ms-rMY/strings.xml | 2 +-
 orbotservice/src/main/res/values-ms/strings.xml | 2 +-
 orbotservice/src/main/res/values-nb/strings.xml | 2 +-
 orbotservice/src/main/res/values-nl/strings.xml | 2 +-
 orbotservice/src/main/res/values-pl/strings.xml | 2 +-
 orbotservice/src/main/res/values-pt-rBR/strings.xml | 2 +-
 orbotservice/src/main/res/values-ro/strings.xml | 2 +-
 orbotservice/src/main/res/values-si-rLK/strings.xml | 2 +-
 orbotservice/src/main/res/values-sv/strings.xml | 2 +-
 orbotservice/src/main/res/values-th/strings.xml | 2 +-
 orbotservice/src/main/res/values-tl/strings.xml | 2 +-
 orbotservice/src/main/res/values-vi/strings.xml | 2 +-
 orbotservice/src/main/res/values-zh-rCN/strings.xml | 2 +-
 orbotservice/src/main/res/values/strings.xml| 2 +-
 71 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/app/src/main/res/values-az/strings.xml 
b/app/src/main/res/values-az/strings.xml
index de881840..6fc0da1f 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -116,7 +116,7 @@
   (DediklÉrimizdÉn heÃ§ biri haqqÄ±nda 
xÉbÉrin yoxdursa, qutunu iÅarÉlÉ)
   HeÃ§ biri
   Tor-un Son HÉddi
-  Wifi vÉ USB ilÉ 
BaÄlanan Cihazlar Ã¼Ã§Ã¼n Tor ÅÉffaf ProksilÉmÉni AktivlÉÅdir (cihazÄ±n 
yenidÉn yÃ¼klÉnmÉsini tÉlÉb edir)
+  Wi-Fi vÉ USB ilÉ 
BaÄlanan Cihazlar

[tor-commits] [orbot/master] Newlines were not being read from LICENSE in about dialog

2018-05-11 Thread n8fr8

commit cff61d1b9bcb33906a7ad4d54b40e73025e3f098
Author: lexi 
Date:   Tue Feb 27 12:53:22 2018 -0500

Newlines were not being read from LICENSE in about dialog
---
 app/src/main/java/org/torproject/android/OrbotMainActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index cbc7349e..1f24ec36 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -521,14 +521,14 @@ public class OrbotMainActivity extends AppCompatActivity
 .show();
 }
 
-public static String readFromAssets(Context context, String filename) 
throws IOException {
+private static String readFromAssets(Context context, String filename) 
throws IOException {
 BufferedReader reader = new BufferedReader(new 
InputStreamReader(context.getAssets().open(filename)));
 
 // do reading, usually loop until end of file reading
 StringBuilder sb = new StringBuilder();
 String mLine = reader.readLine();
 while (mLine != null) {
-sb.append(mLine); // process line
+sb.append(mLine + '\n'); // process line
 mLine = reader.readLine();
 }
 reader.close();



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

[tor-commits] [orbot/master] ..,. -> ... in string res

2018-05-11 Thread n8fr8

commit f49719f1def2a86abdd7749ef69d1f8756fa5ad6
Author: lexi 
Date:   Tue Mar 6 16:11:20 2018 -0500

..,. -> ... in string res
---
 app/src/main/res/values-nl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-nl/strings.xml 
b/app/src/main/res/values-nl/strings.xml
index 1b2edbe7..d3d3cf53 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -277,7 +277,7 @@
   Bridges bijgewerkt
   Herstart Orbot om de 
wijzigingen in te schakelen
   QR-codes
-  Als
 je mobiele netwerk Tor actief blokkeert, kan je een \'bridge-server\' 
gebruiken als alternatieve toegang. SELECTEER een van de opties om te 
configureren en te testen..,.
+  Als
 je mobiele netwerk Tor actief blokkeert, kan je een \'bridge-server\' 
gebruiken als alternatieve toegang. SELECTEER een van de opties om te 
configureren en te testen...
   Bridge-modus
   E-mail
   Web



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

[tor-commits] [orbot/master] "Android" was used instead of "Orbot" in INSTALL

2018-05-11 Thread n8fr8

commit 4b36bcef38ed4f80308797ab7df48332106dd933
Author: lex 
Date:   Thu Feb 22 12:48:38 2018 -0500

"Android" was used instead of "Orbot" in INSTALL
---
 INSTALL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL b/INSTALL
index e1a78980..1624d1a2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 
 Orbot: Android Onion Routing Robot
 ***
-Android is a freely licensed open-source application developed for the
+Orbot is a freely licensed open-source application developed for the
 Android platform. It acts as a front-end to the Tor binary application,
 and also provides an HTTP Proxy for connecting web browsers and other
 HTTP client applications into the Tor SOCKS interface.



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

[tor-commits] [orbot/master] Removed Outdated FAQ in README

2018-05-11 Thread n8fr8

commit 47e053431a313060a3c5614a19888a62aced4a61
Author: lex 
Date:   Wed Mar 7 15:07:53 2018 -0500

Removed Outdated FAQ in README

The link on https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ says 
"This FAQ has been migrated to âGeneral FAQ. The answers in this FAQ may be 
old, incorrect, or obsolete." It tells visitors to see the other FAQ that is 
already linked in the README
---
 README | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README b/README
index fcfcf5e6..9e48f07e 100644
--- a/README
+++ b/README
@@ -18,7 +18,6 @@ is reasonably secure, but please ensure you read the 
instructions and
 configure it properly. Learn more at https://torproject.org/
 
 Tor Frequently Asked Questions:
-https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ
 https://www.torproject.org/faq.html.en
 
 ***



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

[tor-commits] [orbot/master] ..,. -> ... in strings nl

2018-05-11 Thread n8fr8

commit 0eaa27860fcea19bfa8fcbf7d92f8ecf01bea9e5
Author: lexi 
Date:   Tue Mar 6 16:15:10 2018 -0500

..,. -> ... in strings nl
---
 app/src/main/res/values-nl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-nl/strings.xml 
b/app/src/main/res/values-nl/strings.xml
index 703e96cd..7f4f2fad 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -277,7 +277,7 @@
   Bridges bijgewerkt
   Herstart Orbot om de 
wijzigingen in te schakelen
   QR-codes
-  Als
 je mobiele netwerk Tor actief blokkeert, kan je een \'bridge-server\' 
gebruiken als alternatieve toegang. SELECTEER een van de opties om te 
configureren en te testen..,.
+  Als
 je mobiele netwerk Tor actief blokkeert, kan je een \'bridge-server\' 
gebruiken als alternatieve toegang. SELECTEER een van de opties om te 
configureren en te testen...
   Bridge-modus
   E-mail
   Web



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

[tor-commits] [orbot/master] Use ProgressBar instead of off center ProgressDialog

2018-05-11 Thread n8fr8

commit f930ced0efd84e0ebb413aa254d4b2bfe9d731d8
Author: lexi 
Date:   Mon Feb 26 13:49:11 2018 -0500

Use ProgressBar instead of off center ProgressDialog
---
 .../org/torproject/android/ui/AppManagerActivity.java| 16 ++--
 app/src/main/res/layout/layout_apps.xml  |  7 +++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git 
a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java 
b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
index c223d39c..6d29a85f 100644
--- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
@@ -11,13 +11,11 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.torproject.android.BuildConfig;
 import org.torproject.android.service.OrbotConstants;
 import org.torproject.android.R;
 import org.torproject.android.service.util.TorServiceUtils;
 import org.torproject.android.service.vpn.TorifiedApp;
 
-import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -40,12 +38,14 @@ import android.widget.CheckBox;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.ListAdapter;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 public class AppManagerActivity extends AppCompatActivity implements 
OnClickListener, OrbotConstants {
 
 private GridView listApps;
 private ListAdapter adapterApps;
+private ProgressBar progressBar;
 private final static String TAG = "Orbot";
 PackageManager pMgr = null;
 
@@ -57,7 +57,8 @@ public class AppManagerActivity extends AppCompatActivity 
implements OnClickList
 this.setContentView(R.layout.layout_apps);
 setTitle(R.string.apps_mode);
 getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
+listApps = findViewById(R.id.applistview);
+progressBar = findViewById(R.id.progressBar);
 }
 
 /*
@@ -94,20 +95,15 @@ public class AppManagerActivity extends AppCompatActivity 
implements OnClickList
 @Override
 protected void onResume() {
 super.onResume();
-listApps = (GridView) findViewById(R.id.applistview);
 mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
 reloadApps();
 }
 
 private void reloadApps () {
-
 new AsyncTask() {
-private ProgressDialog dialog;
-
 protected void onPreExecute() {
 // Pre Code
-dialog = new ProgressDialog(AppManagerActivity.this, 
android.support.v4.app.DialogFragment.STYLE_NO_TITLE);
-dialog.show();
+progressBar.setVisibility(View.VISIBLE);
 }
 protected Void doInBackground(Void... unused) {
 loadApps(mPrefs);
@@ -115,7 +111,7 @@ public class AppManagerActivity extends AppCompatActivity 
implements OnClickList
 }
 protected void onPostExecute(Void unused) {
 listApps.setAdapter(adapterApps);
-dialog.cancel();
+progressBar.setVisibility(View.GONE);
 }
 }.execute();
 
diff --git a/app/src/main/res/layout/layout_apps.xml 
b/app/src/main/res/layout/layout_apps.xml
index b04887e1..e597163f 100644
--- a/app/src/main/res/layout/layout_apps.xml
+++ b/app/src/main/res/layout/layout_apps.xml
@@ -4,6 +4,13 @@
 android:layout_height="match_parent"
 android:duplicateParentState="true">
 
+
+
 https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] centered app selection GridView in VPN UI

2018-05-11 Thread n8fr8

commit e3f9397aceb8ed74b0b29af40682b7433ca32969
Author: lexi 
Date:   Mon Feb 26 13:45:46 2018 -0500

centered app selection GridView in VPN UI
---
 app/src/main/res/layout/layout_apps.xml | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/layout_apps.xml 
b/app/src/main/res/layout/layout_apps.xml
index ac967fe3..b04887e1 100644
--- a/app/src/main/res/layout/layout_apps.xml
+++ b/app/src/main/res/layout/layout_apps.xml
@@ -1,17 +1,17 @@
 
-http://schemas.android.com/apk/res/android;
 android:layout_width="match_parent"
 android:layout_height="match_parent"
-xmlns:android="http://schemas.android.com/apk/res/android;
 android:duplicateParentState="true">
 
- 
+android:layout_alignParentTop="true"
+android:gravity="center"
+android:numColumns="4">
 
 
 
-
\ No newline at end of file
+
\ No newline at end of file



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

[tor-commits] [orbot/master] Merge pull request #118 from mrphs/patch-1

2018-05-11 Thread n8fr8

commit fb912d79d1382951e45a680618a6802ea6dcb0ff
Merge: 7ab6f505 c1a3a7d6
Author: Nathan Freitas 
Date:   Tue Jan 16 22:44:20 2018 -0500

Merge pull request #118 from mrphs/patch-1

fixed typo in bridge line

 orbotservice/src/main/res/raw-fa/bridges.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



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

[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-github/bug25756'

2018-05-11 Thread nickm

commit aab626405c312a33d521c9ca3729552fd9ccca2e
Merge: b3e591dca de343b4e4
Author: Nick Mathewson 
Date:   Fri May 11 18:15:43 2018 -0400

Merge remote-tracking branch 'catalyst-github/bug25756'

 changes/bug25756|   7 ++
 src/or/connection.c |   8 +-
 src/or/connection.h |   7 +-
 src/or/networkstatus.c  |  71 +-
 src/or/networkstatus.h  |   2 +
 src/test/log_test_helpers.h |   4 +
 src/test/test_routerlist.c  | 175 ++--
 7 files changed, 242 insertions(+), 32 deletions(-)

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

[tor-commits] [tor/master] Make clock_skew_warning() mockable

2018-05-11 Thread nickm

commit c223377ce60ed07a11e0c3b5af29601722b07bac
Author: Taylor Yu 
Date:   Thu May 3 20:57:07 2018 -0500

Make clock_skew_warning() mockable
---
 src/or/connection.c | 8 
 src/or/connection.h | 7 ---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/or/connection.c b/src/or/connection.c
index 4361e1ca0..fa9881cb8 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -5233,10 +5233,10 @@ connection_free_all(void)
  * that we had more faith in and therefore the warning level should have higher
  * severity.
  */
-void
-clock_skew_warning(const connection_t *conn, long apparent_skew, int trusted,
-   log_domain_mask_t domain, const char *received,
-   const char *source)
+MOCK_IMPL(void,
+clock_skew_warning, (const connection_t *conn, long apparent_skew, int trusted,
+ log_domain_mask_t domain, const char *received,
+ const char *source))
 {
   char dbuf[64];
   char *ext_source = NULL, *warn = NULL;
diff --git a/src/or/connection.h b/src/or/connection.h
index a2dce2435..ad3129c9d 100644
--- a/src/or/connection.h
+++ b/src/or/connection.h
@@ -254,9 +254,10 @@ void assert_connection_ok(connection_t *conn, time_t now);
 int connection_or_nonopen_was_started_here(or_connection_t *conn);
 void connection_dump_buffer_mem_stats(int severity);
 
-void clock_skew_warning(const connection_t *conn, long apparent_skew,
-int trusted, log_domain_mask_t domain,
-const char *received, const char *source);
+MOCK_DECL(void, clock_skew_warning,
+  (const connection_t *conn, long apparent_skew, int trusted,
+   log_domain_mask_t domain, const char *received,
+   const char *source));
 
 /** Check if a connection is on the way out so the OOS handler doesn't try
  * to kill more than it needs. */



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

[tor-commits] [tor/master] Factor out warn_early_consensus()

2018-05-11 Thread nickm

commit 0b80a0e500d5132ca4dd77403b5a4c7f23f26a80
Author: Taylor Yu 
Date:   Tue May 1 18:13:37 2018 -0500

Factor out warn_early_consensus()

Factor out the early consensus warning code from
networkstatus_set_current_consensus() into a new function
warn_early_consensus().
---
 src/or/networkstatus.c | 62 ++
 src/or/networkstatus.h |  2 ++
 2 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 44c0638c2..ace9fc94a 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1751,6 +1751,48 @@ handle_missing_protocol_warning(const networkstatus_t *c,
 handle_missing_protocol_warning_impl(c, 1);
 }
 
+/**
+ * Check whether we received a consensus that appears to be coming
+ * from the future.  Because we implicitly trust the directory
+ * authorities' idea of the current time, we produce a warning if we
+ * get an early consensus.
+ *
+ * If we got a consensus that is time stamped far in the past, that
+ * could simply have come from a stale cache.  Possible ways to get a
+ * consensus from the future can include:
+ *
+ * - enough directory authorities have wrong clocks
+ * - directory authorities collude to produce misleading time stamps
+ * - our own clock is wrong (this is by far the most likely)
+ *
+ * We neglect highly improbable scenarios that involve actual time
+ * travel.
+ */
+STATIC void
+warn_early_consensus(const networkstatus_t *c, const char *flavor,
+ time_t now)
+{
+/** If a consensus appears more than this many seconds before its declared
+ * valid-after time, declare that our clock is skewed. */
+#define EARLY_CONSENSUS_NOTICE_SKEW 60
+
+  if (now < c->valid_after - EARLY_CONSENSUS_NOTICE_SKEW) {
+char tbuf[ISO_TIME_LEN+1];
+char dbuf[64];
+long delta = now - c->valid_after;
+char *flavormsg = NULL;
+format_iso_time(tbuf, c->valid_after);
+format_time_interval(dbuf, sizeof(dbuf), delta);
+log_warn(LD_GENERAL, "Our clock is %s behind the time published in the "
+ "consensus network status document (%s UTC).  Tor needs an "
+ "accurate clock to work correctly. Please check your time and "
+ "date settings!", dbuf, tbuf);
+tor_asprintf(, "%s flavor consensus", flavor);
+clock_skew_warning(NULL, delta, 1, LD_GENERAL, flavormsg, "CONSENSUS");
+tor_free(flavormsg);
+  }
+}
+
 /** Try to replace the current cached v3 networkstatus with the one in
  * consensus.  If we don't have enough certificates to validate it,
  * store it in consensus_waiting_for_certs and launch a certificate fetch.
@@ -2053,25 +2095,7 @@ networkstatus_set_current_consensus(const char 
*consensus,
 write_str_to_file(consensus_fname, consensus, 0);
   }
 
-/** If a consensus appears more than this many seconds before its declared
- * valid-after time, declare that our clock is skewed. */
-#define EARLY_CONSENSUS_NOTICE_SKEW 60
-
-  if (now < c->valid_after - EARLY_CONSENSUS_NOTICE_SKEW) {
-char tbuf[ISO_TIME_LEN+1];
-char dbuf[64];
-long delta = now - c->valid_after;
-char *flavormsg = NULL;
-format_iso_time(tbuf, c->valid_after);
-format_time_interval(dbuf, sizeof(dbuf), delta);
-log_warn(LD_GENERAL, "Our clock is %s behind the time published in the "
- "consensus network status document (%s UTC).  Tor needs an "
- "accurate clock to work correctly. Please check your time and "
- "date settings!", dbuf, tbuf);
-tor_asprintf(, "%s flavor consensus", flavor);
-clock_skew_warning(NULL, delta, 1, LD_GENERAL, flavormsg, "CONSENSUS");
-tor_free(flavormsg);
-  }
+  warn_early_consensus(c, flavor, now);
 
   /* We got a new consesus. Reset our md fetch fail cache */
   microdesc_reset_outdated_dirservers_list();
diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h
index 0c325959d..b133f43dc 100644
--- a/src/or/networkstatus.h
+++ b/src/or/networkstatus.h
@@ -153,6 +153,8 @@ int any_client_port_set(const or_options_t *options);
 #ifdef TOR_UNIT_TESTS
 STATIC int networkstatus_set_current_consensus_from_ns(networkstatus_t *c,
 const char *flavor);
+STATIC void warn_early_consensus(const networkstatus_t *c, const char *flavor,
+ time_t now);
 extern networkstatus_t *current_ns_consensus;
 extern networkstatus_t *current_md_consensus;
 #endif /* defined(TOR_UNIT_TESTS) */



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

[tor-commits] [tor/master] Test early-consensus clock skew warnings

2018-05-11 Thread nickm

commit 4921670a8c155965e919debc3048a76b3e868802
Author: Taylor Yu 
Date:   Thu May 3 21:53:24 2018 -0500

Test early-consensus clock skew warnings
---
 src/test/test_routerlist.c | 105 +
 1 file changed, 105 insertions(+)

diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index 88894391b..6dd58d313 100644
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -599,11 +599,111 @@ test_routerlist_router_is_already_dir_fetching(void *arg)
 #undef TEST_ADDR_STR
 #undef TEST_DIR_PORT
 
+static long mock_apparent_skew = 0;
+
+/** Store apparent_skew and assert that the other arguments are as
+ * expected. */
+static void
+mock_clock_skew_warning(const connection_t *conn, long apparent_skew,
+int trusted, log_domain_mask_t domain,
+const char *received, const char *source)
+{
+  (void)conn;
+  mock_apparent_skew = apparent_skew;
+  tt_int_op(trusted, OP_EQ, 1);
+  tt_int_op(domain, OP_EQ, LD_GENERAL);
+  tt_str_op(received, OP_EQ, "microdesc flavor consensus");
+  tt_str_op(source, OP_EQ, "CONSENSUS");
+ done:
+  ;
+}
+
+/** Do common setup for test_timely_consensus() and
+ * test_early_consensus().  Call networkstatus_set_current_consensus()
+ * on a constructed consensus and with an appropriately-modified
+ * approx_time.  Callers expect presence or absence of appropriate log
+ * messages and control events. */
+static int
+test_skew_common(void *arg, time_t now, unsigned long *offset)
+{
+  char *consensus = NULL;
+  int retval = 0;
+
+  *offset = strtoul(arg, NULL, 10);
+
+  /* Initialize the SRV subsystem */
+  MOCK(get_my_v3_authority_cert, get_my_v3_authority_cert_m);
+  mock_cert = authority_cert_parse_from_string(AUTHORITY_CERT_1, NULL);
+  sr_init(0);
+  UNMOCK(get_my_v3_authority_cert);
+
+  construct_consensus(, now);
+  tt_assert(consensus);
+
+  update_approx_time(now + *offset);
+
+  mock_apparent_skew = 0;
+  /* Caller will call UNMOCK() */
+  MOCK(clock_skew_warning, mock_clock_skew_warning);
+  /* Caller will call teardown_capture_of_logs() */
+  setup_capture_of_logs(LOG_WARN);
+  retval = networkstatus_set_current_consensus(consensus, "microdesc", 0,
+   NULL);
+
+ done:
+  tor_free(consensus);
+  return retval;
+}
+
+/** Test non-early consensus */
+static void
+test_timely_consensus(void *arg)
+{
+  time_t now = time(NULL);
+  unsigned long offset = 0;
+  int retval = 0;
+
+  retval = test_skew_common(arg, now, );
+  (void)offset;
+  expect_no_log_msg_containing("behind the time published in the consensus");
+  tt_int_op(retval, OP_EQ, 0);
+  tt_int_op(mock_apparent_skew, OP_EQ, 0);
+ done:
+  teardown_capture_of_logs();
+  UNMOCK(clock_skew_warning);
+}
+
+/** Test early consensus  */
+static void
+test_early_consensus(void *arg)
+{
+  time_t now = time(NULL);
+  unsigned long offset = 0;
+  int retval = 0;
+
+  retval = test_skew_common(arg, now, );
+  /* Can't use expect_single_log_msg() because of unrecognized authorities */
+  expect_log_msg_containing("behind the time published in the consensus");
+  tt_int_op(retval, OP_EQ, 0);
+  /* This depends on construct_consensus() setting valid_after=now+1000 */
+  tt_int_op(mock_apparent_skew, OP_EQ, offset - 1000);
+ done:
+  teardown_capture_of_logs();
+  UNMOCK(clock_skew_warning);
+}
+
 #define NODE(name, flags) \
   { #name, test_routerlist_##name, (flags), NULL, NULL }
 #define ROUTER(name,flags) \
   { #name, test_router_##name, (flags), NULL, NULL }
 
+#define TIMELY(name, arg) \
+  { name, test_timely_consensus, TT_FORK, _setup, \
+(char *)(arg) }
+#define EARLY(name, arg) \
+  { name, test_early_consensus, TT_FORK, _setup, \
+(char *)(arg) }
+
 struct testcase_t routerlist_tests[] = {
   NODE(initiate_descriptor_downloads, 0),
   NODE(launch_descriptor_downloads, 0),
@@ -611,6 +711,11 @@ struct testcase_t routerlist_tests[] = {
   ROUTER(pick_directory_server_impl, TT_FORK),
   { "directory_guard_fetch_with_no_dirinfo",
 test_directory_guard_fetch_with_no_dirinfo, TT_FORK, NULL, NULL },
+  /* These depend on construct_consensus() setting valid_after=now+1000 */
+  TIMELY("timely_consensus1", "1010"),
+  TIMELY("timely_consensus2", "1000"),
+  TIMELY("timely_consensus3", "940"),
+  EARLY("early_consensus1", "939"),
   END_OF_TESTCASES
 };
 



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

[tor-commits] [tor/master] Add expect_no_log_msg_containing()

2018-05-11 Thread nickm

commit be8306c1fb344d9ff3c03b5dc1bb8815706d4ae7
Author: Taylor Yu 
Date:   Thu May 3 21:49:19 2018 -0500

Add expect_no_log_msg_containing()
---
 src/test/log_test_helpers.h | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h
index 70c584eb3..f5bbfcf3f 100644
--- a/src/test/log_test_helpers.h
+++ b/src/test/log_test_helpers.h
@@ -85,6 +85,10 @@ void mock_dump_saved_logs(void);
   assert_log_predicate(!mock_saved_log_has_message(str), \
 "expected log to not contain " # str);
 
+#define expect_no_log_msg_containing(str) \
+  assert_log_predicate(!mock_saved_log_has_message_containing(str), \
+"expected log to not contain " # str);
+
 #define expect_log_severity(severity) \
   assert_log_predicate(mock_saved_log_has_severity(severity), \
 "expected log to contain severity " # severity);



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

[tor-commits] [tor/master] Improve tolerance for dirauths with skewed clocks

2018-05-11 Thread nickm

commit de343b4e421c0c651eaac1d52d23c3c792bee73a
Author: Taylor Yu 
Date:   Fri May 4 17:16:06 2018 -0500

Improve tolerance for dirauths with skewed clocks

Previously, an authority with a clock more than 60 seconds ahead could
cause a client with a correct clock to warn that the client's clock
was behind.  Now the clocks of a majority of directory authorities
have to be ahead of the client before this warning will occur.

Relax the early-consensus check so that a client's clock must be 60
seconds behind the earliest time that a given sufficiently-signed
consensus could possibly be available.

Add a new unit test that calls warn_early_consensus() directly.

Fixes bug 25756; bugfix on 0.2.2.25-alpha.
---
 changes/bug25756   |  7 +
 src/or/networkstatus.c | 14 +++---
 src/test/test_routerlist.c | 64 +++---
 3 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/changes/bug25756 b/changes/bug25756
new file mode 100644
index 0..ff5ac0391
--- /dev/null
+++ b/changes/bug25756
@@ -0,0 +1,7 @@
+  o Minor bugfixes (error reporting):
+- Improve tolerance for directory authorities with skewed clocks.
+  Previously, an authority with a clock more than 60 seconds ahead
+  could cause a client with a correct clock to warn that the
+  client's clock was behind.  Now the clocks of a majority of
+  directory authorities have to be ahead of the client before this
+  warning will occur.  Fixes bug 25756; bugfix on 0.2.2.25-alpha.
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index d1c217119..51b2f4af1 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1777,10 +1777,18 @@ warn_early_consensus(const networkstatus_t *c, const 
char *flavor,
   long delta = now - c->valid_after;
   char *flavormsg = NULL;
 
-/** If a consensus appears more than this many seconds before its declared
- * valid-after time, declare that our clock is skewed. */
+/** If a consensus appears more than this many seconds before it could
+ * possibly be a sufficiently-signed consensus, declare that our clock
+ * is skewed. */
 #define EARLY_CONSENSUS_NOTICE_SKEW 60
-  if (now >= c->valid_after - EARLY_CONSENSUS_NOTICE_SKEW)
+
+  /* We assume that if a majority of dirauths have accurate clocks,
+   * the earliest that a dirauth with a skewed clock could possibly
+   * publish a sufficiently-signed consensus is (valid_after -
+   * dist_seconds).  Before that time, the skewed dirauth would be
+   * unable to obtain enough authority signatures for the consensus to
+   * be valid. */
+  if (now >= c->valid_after - c->dist_seconds - EARLY_CONSENSUS_NOTICE_SKEW)
 return;
 
   format_iso_time(tbuf, c->valid_after);
diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index 6dd58d313..701227c1c 100644
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -692,6 +692,62 @@ test_early_consensus(void *arg)
   UNMOCK(clock_skew_warning);
 }
 
+/** Test warn_early_consensus(), expecting no warning  */
+static void
+test_warn_early_consensus_no(const networkstatus_t *c, time_t now,
+ long offset)
+{
+  mock_apparent_skew = 0;
+  setup_capture_of_logs(LOG_WARN);
+  warn_early_consensus(c, "microdesc", now + offset);
+  expect_no_log_msg_containing("behind the time published in the consensus");
+  tt_int_op(mock_apparent_skew, OP_EQ, 0);
+ done:
+  teardown_capture_of_logs();
+}
+
+/** Test warn_early_consensus(), expecting a warning */
+static void
+test_warn_early_consensus_yes(const networkstatus_t *c, time_t now,
+  long offset)
+{
+  mock_apparent_skew = 0;
+  setup_capture_of_logs(LOG_WARN);
+  warn_early_consensus(c, "microdesc", now + offset);
+  /* Can't use expect_single_log_msg() because of unrecognized authorities */
+  expect_log_msg_containing("behind the time published in the consensus");
+  tt_int_op(mock_apparent_skew, OP_EQ, offset);
+ done:
+  teardown_capture_of_logs();
+}
+
+/**
+ * Test warn_early_consensus() directly, checking both the non-warning
+ * case (consensus is not early) and the warning case (consensus is
+ * early).  Depends on EARLY_CONSENSUS_NOTICE_SKEW=60.
+ */
+static void
+test_warn_early_consensus(void *arg)
+{
+  networkstatus_t *c = NULL;
+  time_t now = time(NULL);
+
+  (void)arg;
+  c = tor_malloc_zero(sizeof *c);
+  c->valid_after = now;
+  c->dist_seconds = 300;
+  mock_apparent_skew = 0;
+  MOCK(clock_skew_warning, mock_clock_skew_warning);
+  test_warn_early_consensus_no(c, now, 60);
+  test_warn_early_consensus_no(c, now, 0);
+  test_warn_early_consensus_no(c, now, -60);
+  test_warn_early_consensus_no(c, now, -360);
+  test_warn_early_consensus_yes(c, now, -361);
+  test_warn_early_consensus_yes(c, now, -600);
+  UNMOCK(clock_skew_warning);
+  tor_free(c);
+}
+
 #define NODE(name, flags) \
   { #name,

[tor-commits] [tor/master] tests: Add "now" param to construct_consensus()

2018-05-11 Thread nickm

commit 5bd2060054095f590559beb57b46c353476084f0
Author: Taylor Yu 
Date:   Thu May 3 15:24:31 2018 -0500

tests: Add "now" param to construct_consensus()

construct_consensus() in test_routerlist.c created votes using a
timestamp from time().  Tests that called construct_consensus() might
have nondeterministic results if they rely on time() not changing too
much on two successive calls.

Neither existing of the two existing tests that calls
construct_consensus is likely to have a failure due to this problem.
---
 src/test/test_routerlist.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index 7fed65628..88894391b 100644
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -37,7 +37,7 @@
 #include "test_dir_common.h"
 #include "log_test_helpers.h"
 
-void construct_consensus(char **consensus_text_md);
+void construct_consensus(char **consensus_text_md, time_t now);
 
 static authority_cert_t *mock_cert;
 
@@ -136,7 +136,7 @@ test_routerlist_launch_descriptor_downloads(void *arg)
 }
 
 void
-construct_consensus(char **consensus_text_md)
+construct_consensus(char **consensus_text_md, time_t now)
 {
   networkstatus_t *vote = NULL;
   networkstatus_t *v1 = NULL, *v2 = NULL, *v3 = NULL;
@@ -144,7 +144,6 @@ construct_consensus(char **consensus_text_md)
   authority_cert_t *cert1=NULL, *cert2=NULL, *cert3=NULL;
   crypto_pk_t *sign_skey_1=NULL, *sign_skey_2=NULL, *sign_skey_3=NULL;
   crypto_pk_t *sign_skey_leg=NULL;
-  time_t now = time(NULL);
   smartlist_t *votes = NULL;
   int n_vrs;
 
@@ -259,7 +258,7 @@ test_router_pick_directory_server_impl(void *arg)
   rs = router_pick_directory_server_impl(V3_DIRINFO, (const int) 0, NULL);
   tt_ptr_op(rs, OP_EQ, NULL);
 
-  construct_consensus(_text_md);
+  construct_consensus(_text_md, now);
   tt_assert(consensus_text_md);
   con_md = networkstatus_parse_vote_from_string(consensus_text_md, NULL,
 NS_TYPE_CONSENSUS);
@@ -453,6 +452,7 @@ test_directory_guard_fetch_with_no_dirinfo(void *arg)
   int retval;
   char *consensus_text_md = NULL;
   or_options_t *options = get_options_mutable();
+  time_t now = time(NULL);
 
   (void) arg;
 
@@ -496,7 +496,7 @@ test_directory_guard_fetch_with_no_dirinfo(void *arg)
   conn->requested_resource = tor_strdup("ns");
 
   /* Construct a consensus */
-  construct_consensus(_text_md);
+  construct_consensus(_text_md, now);
   tt_assert(consensus_text_md);
 
   /* Place the consensus in the dirconn */
@@ -507,7 +507,7 @@ test_directory_guard_fetch_with_no_dirinfo(void *arg)
   args.body_len = strlen(consensus_text_md);
 
   /* Update approx time so that the consensus is considered live */
-  update_approx_time(time(NULL)+1010);
+  update_approx_time(now+1010);
 
   setup_capture_of_logs(LOG_DEBUG);
 



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

[tor-commits] [tor/master] Deindent warn_early_consensus()

2018-05-11 Thread nickm

commit d6948bc7764dca7644b331aaf37453b328239e6d
Author: Taylor Yu 
Date:   Thu May 3 22:11:44 2018 -0500

Deindent warn_early_consensus()

Remove one level of indentation by returning early from the function.
---
 src/or/networkstatus.c | 31 ---
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index ace9fc94a..d1c217119 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1772,25 +1772,26 @@ STATIC void
 warn_early_consensus(const networkstatus_t *c, const char *flavor,
  time_t now)
 {
+  char tbuf[ISO_TIME_LEN+1];
+  char dbuf[64];
+  long delta = now - c->valid_after;
+  char *flavormsg = NULL;
+
 /** If a consensus appears more than this many seconds before its declared
  * valid-after time, declare that our clock is skewed. */
 #define EARLY_CONSENSUS_NOTICE_SKEW 60
+  if (now >= c->valid_after - EARLY_CONSENSUS_NOTICE_SKEW)
+return;
 
-  if (now < c->valid_after - EARLY_CONSENSUS_NOTICE_SKEW) {
-char tbuf[ISO_TIME_LEN+1];
-char dbuf[64];
-long delta = now - c->valid_after;
-char *flavormsg = NULL;
-format_iso_time(tbuf, c->valid_after);
-format_time_interval(dbuf, sizeof(dbuf), delta);
-log_warn(LD_GENERAL, "Our clock is %s behind the time published in the "
- "consensus network status document (%s UTC).  Tor needs an "
- "accurate clock to work correctly. Please check your time and "
- "date settings!", dbuf, tbuf);
-tor_asprintf(, "%s flavor consensus", flavor);
-clock_skew_warning(NULL, delta, 1, LD_GENERAL, flavormsg, "CONSENSUS");
-tor_free(flavormsg);
-  }
+  format_iso_time(tbuf, c->valid_after);
+  format_time_interval(dbuf, sizeof(dbuf), delta);
+  log_warn(LD_GENERAL, "Our clock is %s behind the time published in the "
+   "consensus network status document (%s UTC).  Tor needs an "
+   "accurate clock to work correctly. Please check your time and "
+   "date settings!", dbuf, tbuf);
+  tor_asprintf(, "%s flavor consensus", flavor);
+  clock_skew_warning(NULL, delta, 1, LD_GENERAL, flavormsg, "CONSENSUS");
+  tor_free(flavormsg);
 }
 
 /** Try to replace the current cached v3 networkstatus with the one in



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

[tor-commits] [tor/master] Add a CONTRIBUTING file

2018-05-11 Thread nickm

commit f7949a440f1356e08550d26da5c5749fa35f5b3d
Author: Nick Mathewson 
Date:   Fri May 11 13:19:37 2018 -0400

Add a CONTRIBUTING file

This file contains pointers to other important top-level resources,
and some info about acceptable licenses.  Also, add that info to
CodingStandards.md
---
 CONTRIBUTING   | 39 +++
 Makefile.am|  1 +
 doc/HACKING/CodingStandards.md | 18 ++
 3 files changed, 58 insertions(+)

diff --git a/CONTRIBUTING b/CONTRIBUTING
new file mode 100644
index 0..7d8bd0341
--- /dev/null
+++ b/CONTRIBUTING
@@ -0,0 +1,39 @@
+Contributing to Tor
+---
+
+### Getting started
+
+Welcome!
+
+We have a bunch of documentation about how to develop Tor in the
+doc/HACKING/ directory.  We recommend that you start with
+doc/HACKING/README.1st.md , and then go from there.  It will tell
+you how to find your way around the source code, how to get
+involved with the Tor community, how to write patches, and much
+more!
+
+You don't have to be a C developer to help with Tor: have a look
+at https://www.torproject.org/getinvolved/volunteer.html.en !
+
+The Tor Project is committed to fostering a inclusive community
+where people feel safe to engage, share their points of view, and
+participate. For the latest version of our Code of Conduct, please
+see
+
+https://gitweb.torproject.org/community/policies.git/plain/code_of_conduct.txt
+
+
+
+### License issues
+
+Tor is distributed under the license terms in the LICENSE -- in
+brief, the "3-clause BSD license".  If you send us code to
+distribute with Tor, it needs to be code that we can distribute
+under those terms.  Please don't send us patches unless you agree
+to allow this.
+
+Some compatible licenses include:
+
+  - 3-clause BSD
+  - 2-clause BSD
+  - CC0 Public Domain Dedication
diff --git a/Makefile.am b/Makefile.am
index 97a39031a..58ff9fb3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,6 +38,7 @@ include contrib/include.am
 
 EXTRA_DIST+= \
ChangeLog   \
+   CONTRIBUTING\
INSTALL \
LICENSE \
Makefile.nmake  \
diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md
index 79a6a9f0c..3711f7019 100644
--- a/doc/HACKING/CodingStandards.md
+++ b/doc/HACKING/CodingStandards.md
@@ -42,6 +42,23 @@ If you have changed build system components:
- For example, if you have changed Makefiles, autoconf files, or anything
  else that affects the build system.
 
+License issues
+==
+
+Tor is distributed under the license terms in the LICENSE -- in
+brief, the "3-clause BSD license".  If you send us code to
+distribute with Tor, it needs to be code that we can distribute
+under those terms.  Please don't send us patches unless you agree
+to allow this.
+
+Some compatible licenses include:
+
+  - 3-clause BSD
+  - 2-clause BSD
+  - CC0 Public Domain Dedication
+
+
+
 How we use Git branches
 ===
 
@@ -417,3 +434,4 @@ the functions that call your function rely on it doing 
something, then your
 function should mention that it does that something in the documentation.  If
 you rely on a function doing something beyond what is in its documentation,
 then you should watch out, or it might do something else later.
+



___
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 'contributing'

2018-05-11 Thread nickm

commit cbb13df8080b660e5d20962c31c8744ed190d2e9
Merge: f6c96fd0c f7949a440
Author: Nick Mathewson 
Date:   Fri May 11 17:59:09 2018 -0400

Merge branch 'contributing'

 CONTRIBUTING   | 39 +++
 Makefile.am|  1 +
 doc/HACKING/CodingStandards.md | 18 ++
 3 files changed, 58 insertions(+)



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

[tor-commits] [tor/master] improve a URL

2018-05-11 Thread nickm

commit b3e591dca1a7343a49bc949e8f75a242efb7fb72
Author: Nick Mathewson 
Date:   Fri May 11 18:00:30 2018 -0400

improve a URL
---
 CONTRIBUTING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING b/CONTRIBUTING
index 7d8bd0341..3569f45a8 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -13,7 +13,7 @@ involved with the Tor community, how to write patches, and 
much
 more!
 
 You don't have to be a C developer to help with Tor: have a look
-at https://www.torproject.org/getinvolved/volunteer.html.en !
+at https://www.torproject.org/getinvolved/volunteer !
 
 The Tor Project is committed to fostering a inclusive community
 where people feel safe to engage, share their points of view, and

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

[tor-commits] [tor/master] Hold monotonic time constant during channel/outbound_cell test

2018-05-11 Thread nickm

commit 24299d385d38a254eabde531a8f4f7830ecb088d
Author: Nick Mathewson 
Date:   Tue May 1 18:44:11 2018 -0400

Hold monotonic time constant during channel/outbound_cell test

This change should make it impossible for the monotonic time to roll
over from one EWMA tick to the next during this test, and make it so
that this test never invokes scale_active_circuits() (which it
doesn't test).

(Earlier changes during the 0.3.4 series should make this call even
rarer than it was before, since we fixed #25927 and removed
cached_gettimeofday.  Because this test didn't update
cached_gettimeofday, the chance of rolling over a 10-second interval
was much higher.)

Closes ticket 25994; bugfix on 0.3.3.1-alpha when this test was
introduced.
---
 changes/ticket25994 | 5 +
 src/test/test_channel.c | 6 ++
 2 files changed, 11 insertions(+)

diff --git a/changes/ticket25994 b/changes/ticket25994
new file mode 100644
index 0..135417401
--- /dev/null
+++ b/changes/ticket25994
@@ -0,0 +1,5 @@
+  o Minor bugfixes (tests):
+- Change the behavior of the "channel/outbound" test so that it never
+  causes a 10-second rollover for the EWMA circuitmux code. Previously,
+  this behavior would happen randomly, and result in fluctuating test
+  coverage. Fixes bug 25994; bugfix on 0.3.3.1-alpha.
diff --git a/src/test/test_channel.c b/src/test/test_channel.c
index 7d5018ef5..b20063c85 100644
--- a/src/test/test_channel.c
+++ b/src/test/test_channel.c
@@ -544,6 +544,11 @@ test_channel_outbound_cell(void *arg)
 
   (void) arg;
 
+  /* Set the test time to be mocked, since this test assumes that no
+   * time will pass, ewma values will not need to be re-scaled, and so on */
+  monotime_enable_test_mocking();
+  monotime_set_mock_time_nsec(U64_LITERAL(10) * 12345);
+
   cmux_ewma_set_options(NULL,NULL);
 
   /* The channel will be freed so we need to hijack this so the scheduler
@@ -660,6 +665,7 @@ test_channel_outbound_cell(void *arg)
   tor_free(p_cell);
   channel_free_all();
   UNMOCK(scheduler_release_channel);
+  monotime_disable_test_mocking();
 }
 
 /* Test inbound cell. The callstack is:



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

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug25994'

2018-05-11 Thread nickm

commit f6c96fd0cacfb44b4a97ac2a9887a80920937da1
Merge: 962c2f877 24299d385
Author: Nick Mathewson 
Date:   Fri May 11 17:57:59 2018 -0400

Merge remote-tracking branch 'public/bug25994'

 changes/ticket25994 | 5 +
 src/test/test_channel.c | 6 ++
 2 files changed, 11 insertions(+)

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

[tor-commits] [translation/support-censorship] Update translations for support-censorship

2018-05-11 Thread translation

commit 603db85bb53dd1dc71697735b2f4193fabaf9874
Author: Translation commit bot 
Date:   Fri May 11 20:48:56 2018 +

Update translations for support-censorship
---
 ru.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ru.json b/ru.json
index cf1b6877a..1947a5841 100644
--- a/ru.json
+++ b/ru.json
@@ -9,13 +9,13 @@
"id": "#censorship-2",
"control": "censorship-2",
"title": "ÐÐ¾Ð¹ Ð»ÑÐ±Ð¸Ð¼ÑÐ¹ ÑÐ°Ð¹Ñ Ð±Ð»Ð¾ÐºÐ¸ÑÑÐµÑ 
Ð´Ð¾ÑÑÑÐ¿ ÑÐµÑÐµÐ· Tor.",
-   "description": "Sorry to hear that you can't visit 
the website you wanted! Sometimes websites will block Tor users because they 
can't tell the difference between the average Tor user and automated traffic. 
The best success we've had in getting sites to unblock Tor users is getting 
users to contact the site administrators directly. Something like this might do 
the trick:\"Hi! I tried to access your site xyz.com while using Tor 
Browser and discovered that you don't allow Tor users to access your site. I 
urge you to reconsider this decision; Tor is used by people all over the world 
to protect their privacy and fight censorship. By blocking Tor users, you are 
likely blocking people in repressive countries who want to use a free internet, 
journalists and researchers who want to protect themselves from discovery, 
whistleblowers, activists, and ordinary people who want to opt out of invasive 
third party tracking. Please take a strong stance in favor of digital priv
 acy and internet freedom, and allow Tor users access to xyz.com. Thank 
you.\"In the case of banks, and other sensitive websites, it is also 
common to see geography-based blocking (if a bank knows you generally access 
their services from one country, and suddenly you are connecting from an exit 
relay on the other side of the world, your account may be locked or suspended). 
If you are unable to connect to an onion service, please see I cannot reach X.onion!"
+   "description": "ÐÐµÑÐ°Ð»ÑÐ½Ð¾ ÑÐ»ÑÑÐ°ÑÑ, 
ÑÑÐ¾ Ð²Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾ÑÐµÑÐ¸ÑÑ Ð²ÐµÐ±-ÑÐ°Ð¹Ñ, ÐºÐ¾ÑÐ¾ÑÑÐ¹ 
Ð²Ð°Ð¼ Ð½ÑÐ¶ÐµÐ½! ÐÐ½Ð¾Ð³Ð´Ð° Ð²ÐµÐ±-ÑÐ°Ð¹ÑÑ Ð±Ð»Ð¾ÐºÐ¸ÑÑÑÑ 
Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Tor, Ð¿Ð¾ÑÐ¾Ð¼Ñ ÑÑÐ¾ Ð¾Ð½Ð¸ Ð½Ðµ Ð¼Ð¾Ð³ÑÑ 
Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ ÑÐ°Ð·Ð½Ð¸ÑÑ Ð¼ÐµÐ¶Ð´Ñ Ð¾Ð±ÑÑÐ½ÑÐ¼ 
Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼ Tor Ð¸ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸Ð¼ 
ÑÑÐ°ÑÐ¸ÐºÐ¾Ð¼. ÐÐ°Ð¸Ð»ÑÑÑÐ¸Ð¼ Ð¸Ð·Ð²ÐµÑÑÐ½ÑÐ¼ Ð½Ð°Ð¼ Ð²ÑÑÐ¾Ð´Ð¾Ð¼  
Ð´Ð»Ñ ÑÐ°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Tor Ð±ÑÐ´ÐµÑ 
ÑÐ»ÐµÐ´ÑÑÑÐµÐµ: Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ¼ Ð½Ð°Ð´Ð»ÐµÐ¶Ð¸Ñ 
Ð½Ð°Ð¿ÑÑÐ¼ÑÑ Ð¾Ð±ÑÐ°ÑÐ°ÑÑÑÑ Ðº Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°Ð¼ 
ÑÐ°Ð¹ÑÐ°. ÐÐ½Ð¾Ð³Ð´Ð° ÑÑÐ°Ð±Ð°ÑÑÐ²Ð°ÐµÑ ÑÐ°ÐºÐ¾Ð¹ ÑÑÑÐº:\"ÐÑÐ¸Ð²ÐµÑ! Ð¯ Ð¿Ð¾Ð¿ÑÑÐ°Ð»ÑÑ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð´Ð¾ÑÑÑÐ¿ Ðº 
Ð²Ð°ÑÐµÐ¼Ñ ÑÐ°Ð¹ÑÑ xyz.com ÑÐµÑÐµÐ· Tor Browser Ð¸ Ð¾Ð±Ð½Ð°ÑÑÐ¶Ð¸Ð», 
ÑÑÐ¾ Ð²Ñ Ð½Ðµ ÑÐ°Ð·ÑÐµÑÐ°ÐµÑÐµ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ
 ¼ Tor Ð·Ð°ÑÐ¾Ð´Ð¸ÑÑ Ð½Ð° Ð½ÐµÐ³Ð¾. Ð¯ Ð½Ð°ÑÑÐ¾ÑÑÐµÐ»ÑÐ½Ð¾ 
Ð¿ÑÐ¸Ð·ÑÐ²Ð°Ñ Ð²Ð°Ñ Ð¿ÐµÑÐµÑÐ¼Ð¾ÑÑÐµÑÑ ÑÑÐ¾ ÑÐµÑÐµÐ½Ð¸Ðµ: Tor 
Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð»ÑÐ´ÑÐ¼Ð¸ Ð²Ð¾ Ð²ÑÐµÐ¼ Ð¼Ð¸ÑÐµ Ð´Ð»Ñ 
Ð·Ð°ÑÐ¸ÑÑ Ð¸Ñ ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÐ¸ Ð¸ Ð±Ð¾ÑÑÐ±Ñ Ñ 
ÑÐµÐ½Ð·ÑÑÐ¾Ð¹. ÐÐ»Ð¾ÐºÐ¸ÑÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Tor, Ð²Ñ 
Ð½Ð°Ð²ÐµÑÐ½ÑÐºÐ° Ð±Ð»Ð¾ÐºÐ¸ÑÑÐµÑÐµ Ð»ÑÐ´ÐµÐ¹ Ð² ÑÐµÐ¿ÑÐµÑÑÐ¸Ð²Ð½ÑÑ 
ÑÑÑÐ°Ð½Ð°Ñ, ÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ¾ÑÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ 
ÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐ¹ Ð¸Ð½ÑÐµÑÐ½ÐµÑ, Ð¶ÑÑÐ½Ð°Ð»Ð¸ÑÑÐ¾Ð² Ð¸ 
Ð¸ÑÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, ÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ¾ÑÑÑ Ð·Ð°ÑÐ¸ÑÐ¸ÑÑ 
ÑÐµÐ±Ñ Ð¾Ñ ÑÐ»ÐµÐ¶ÐºÐ¸ Ð¸ Ð¾ÑÐ²ÐµÐ´Ð¾Ð¼Ð¸ÑÐµÐ»ÐµÐ¹, Ð°ÐºÑÐ¸Ð²Ð¸ÑÑÐ¾Ð² 
Ð¸ Ð¾Ð±ÑÑÐ½ÑÑ Ð»ÑÐ´ÐµÐ¹, ÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ¾ÑÑÑ Ð¾ÑÐºÐ°Ð·Ð°ÑÑÑÑ 
Ð¾Ñ Ð¸Ð½Ð²Ð°Ð·Ð¸Ð²Ð½Ð¾Ð³Ð¾ Ð¾ÑÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ ÑÑÐµÑÑÐµÐ¹ 
ÑÑÐ¾ÑÐ¾Ð½Ð¾Ð¹. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¸Ð´ÐµÑÐ¶Ð¸Ð²Ð°Ð¹ÑÐµÑÑ 
ÑÐµÑÐ¸ÑÐµÐ»ÑÐ½Ð¾Ð¹ Ð¿Ð¾Ð·Ð¸ÑÐ¸Ð¸ Ð² Ð¿Ð¾Ð»ÑÐ·Ñ ÐºÐ¾Ð½ÑÐ¸
 Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÐ¸ ÑÐ¸ÑÑÐ¾Ð²Ð¾Ð³Ð¾ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° Ð¸ 
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð² Ð¸Ð½ÑÐµÑÐ½ÐµÑÐµ Ð¸ ÑÐ°Ð·ÑÐµÑÐ°Ð¹ÑÐµ 
Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ¼ Tor Ð·Ð°ÑÐ¾Ð´Ð¸ÑÑ Ð½Ð° xyz.com. 
Ð¡Ð¿Ð°ÑÐ¸Ð±Ð¾.\"Ð ÑÐ»ÑÑÐ°Ðµ Ñ Ð±Ð°Ð½ÐºÐ°Ð¼Ð¸ Ð¸ Ð´ÑÑÐ³Ð¸Ð¼Ð¸ 
ÑÑÐ²ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½ÑÐ¼Ð¸ Ð²ÐµÐ±-ÑÐ°Ð¹ÑÐ°Ð¼Ð¸ ÑÐ°ÐºÐ¶Ðµ ÑÐ°ÑÑÐ¾ 
Ð½Ð°Ð±Ð»ÑÐ´Ð°ÐµÑÑÑ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ðµ 
Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ (ÐµÑÐ»Ð¸ Ð±Ð°Ð½Ðº Ð·Ð½Ð°ÐµÑ, ÑÑÐ¾ Ð²Ñ 
Ð¾Ð±ÑÑÐ½Ð¾ Ð¾Ð±ÑÐ°ÑÐ°ÐµÑÐµÑÑ Ðº Ð¸Ñ ÑÑÐ»ÑÐ³Ð°Ð¼ Ð¸Ð· Ð¾Ð´Ð½Ð¾Ð¹ 
ÑÑÑÐ°Ð½Ñ Ð¸ Ð²Ð´ÑÑÐ³ Ð²Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ°ÐµÑÐµÑÑ ÑÐµÑÐµÐ· 
ÑÐµÑÑÐ°Ð½ÑÐ»ÑÑÐ¾Ñ Ð½Ð° Ð´ÑÑÐ³Ð¾Ð¹ ÑÑÐ¾ÑÐ¾Ð½Ðµ Ð¼Ð¸ÑÐ°, Ð²Ð°ÑÐ° 
ÑÑÑÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð¸ ÑÑÑÑ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ 
Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ñ Ð¸Ð»Ð¸ Ð·Ð°Ð¼Ð¾ÑÐ¾Ð¶ÐµÐ½Ñ). ÐÑÐ»Ð¸ Ð²Ñ Ð½Ðµ 
Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ Ðº onion-ÑÐ°Ð¹ÑÑ, ÑÐ¼. Ð¯ Ð½Ðµ Ð¼Ð¾Ð³Ñ Ð¾ÑÐºÑÑÑÑ X.onion!"
 },
 "censorship-3": {

[tor-commits] [translation/support-tbb] Update translations for support-tbb

2018-05-11 Thread translation

commit 53066f5fcb15038f923029472cbe353f79ad215d
Author: Translation commit bot 
Date:   Fri May 11 20:49:43 2018 +

Update translations for support-tbb
---
 ru.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru.json b/ru.json
index 384d205d3..1cbaa7fb0 100644
--- a/ru.json
+++ b/ru.json
@@ -39,7 +39,7 @@
"id": "#tbb-7",
"control": "tbb-7",
"title": "ÐÐ¾Ð¹ Ð»ÑÐ±Ð¸Ð¼ÑÐ¹ ÑÐ°Ð¹Ñ Ð±Ð»Ð¾ÐºÐ¸ÑÑÐµÑ 
Ð´Ð¾ÑÑÑÐ¿ ÑÐµÑÐµÐ· Tor.",
-   "description": "Sorry to hear that you can't visit 
the website you wanted! Sometimes websites will block Tor users because they 
can't tell the difference between the average Tor user and automated traffic. 
The best success we've had in getting sites to unblock Tor users is getting 
users to contact the site administrators directly. Something like this might do 
the trick:\"Hi! I tried to access your site xyz.com while using Tor 
Browser and discovered that you don't allow Tor users to access your site. I 
urge you to reconsider this decision; Tor is used by people all over the world 
to protect their privacy and fight censorship. By blocking Tor users, you are 
likely blocking people in repressive countries who want to use a free internet, 
journalists and researchers who want to protect themselves from discovery, 
whistleblowers, activists, and ordinary people who want to opt out of invasive 
third party tracking. Please take a strong stance in favor of digital priv
 acy and internet freedom, and allow Tor users access to xyz.com. Thank 
you.\"In the case of banks, and other sensitive websites, it is also 
common to see geography-based blocking (if a bank knows you generally access 
their services from one country, and suddenly you are connecting from an exit 
relay on the other side of the world, your account may be locked or suspended). 
If you are unable to connect to an onion service, please see I cannot reach X.onion!"
+   "description": "ÐÐµÑÐ°Ð»ÑÐ½Ð¾ ÑÐ»ÑÑÐ°ÑÑ, 
ÑÑÐ¾ Ð²Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾ÑÐµÑÐ¸ÑÑ Ð²ÐµÐ±-ÑÐ°Ð¹Ñ, ÐºÐ¾ÑÐ¾ÑÑÐ¹ 
Ð²Ð°Ð¼ Ð½ÑÐ¶ÐµÐ½! ÐÐ½Ð¾Ð³Ð´Ð° Ð²ÐµÐ±-ÑÐ°Ð¹ÑÑ Ð±Ð»Ð¾ÐºÐ¸ÑÑÑÑ 
Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Tor, Ð¿Ð¾ÑÐ¾Ð¼Ñ ÑÑÐ¾ Ð¾Ð½Ð¸ Ð½Ðµ Ð¼Ð¾Ð³ÑÑ 
Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ ÑÐ°Ð·Ð½Ð¸ÑÑ Ð¼ÐµÐ¶Ð´Ñ Ð¾Ð±ÑÑÐ½ÑÐ¼ 
Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼ Tor Ð¸ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸Ð¼ 
ÑÑÐ°ÑÐ¸ÐºÐ¾Ð¼. ÐÐ°Ð¸Ð»ÑÑÑÐ¸Ð¼ Ð¸Ð·Ð²ÐµÑÑÐ½ÑÐ¼ Ð½Ð°Ð¼ Ð²ÑÑÐ¾Ð´Ð¾Ð¼  
Ð´Ð»Ñ ÑÐ°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Tor Ð±ÑÐ´ÐµÑ 
ÑÐ»ÐµÐ´ÑÑÑÐµÐµ: Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ¼ Ð½Ð°Ð´Ð»ÐµÐ¶Ð¸Ñ 
Ð½Ð°Ð¿ÑÑÐ¼ÑÑ Ð¾Ð±ÑÐ°ÑÐ°ÑÑÑÑ Ðº Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°Ð¼ 
ÑÐ°Ð¹ÑÐ°. ÐÐ½Ð¾Ð³Ð´Ð° ÑÑÐ°Ð±Ð°ÑÑÐ²Ð°ÐµÑ ÑÐ°ÐºÐ¾Ð¹ ÑÑÑÐº:\"ÐÑÐ¸Ð²ÐµÑ! Ð¯ Ð¿Ð¾Ð¿ÑÑÐ°Ð»ÑÑ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð´Ð¾ÑÑÑÐ¿ Ðº 
Ð²Ð°ÑÐµÐ¼Ñ ÑÐ°Ð¹ÑÑ xyz.com ÑÐµÑÐµÐ· Tor Browser Ð¸ Ð¾Ð±Ð½Ð°ÑÑÐ¶Ð¸Ð», 
ÑÑÐ¾ Ð²Ñ Ð½Ðµ ÑÐ°Ð·ÑÐµÑÐ°ÐµÑÐµ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ
 ¼ Tor Ð·Ð°ÑÐ¾Ð´Ð¸ÑÑ Ð½Ð° Ð½ÐµÐ³Ð¾. Ð¯ Ð½Ð°ÑÑÐ¾ÑÑÐµÐ»ÑÐ½Ð¾ 
Ð¿ÑÐ¸Ð·ÑÐ²Ð°Ñ Ð²Ð°Ñ Ð¿ÐµÑÐµÑÐ¼Ð¾ÑÑÐµÑÑ ÑÑÐ¾ ÑÐµÑÐµÐ½Ð¸Ðµ: Tor 
Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð»ÑÐ´ÑÐ¼Ð¸ Ð²Ð¾ Ð²ÑÐµÐ¼ Ð¼Ð¸ÑÐµ Ð´Ð»Ñ 
Ð·Ð°ÑÐ¸ÑÑ Ð¸Ñ ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÐ¸ Ð¸ Ð±Ð¾ÑÑÐ±Ñ Ñ 
ÑÐµÐ½Ð·ÑÑÐ¾Ð¹. ÐÐ»Ð¾ÐºÐ¸ÑÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Tor, Ð²Ñ 
Ð½Ð°Ð²ÐµÑÐ½ÑÐºÐ° Ð±Ð»Ð¾ÐºÐ¸ÑÑÐµÑÐµ Ð»ÑÐ´ÐµÐ¹ Ð² ÑÐµÐ¿ÑÐµÑÑÐ¸Ð²Ð½ÑÑ 
ÑÑÑÐ°Ð½Ð°Ñ, ÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ¾ÑÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ 
ÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐ¹ Ð¸Ð½ÑÐµÑÐ½ÐµÑ, Ð¶ÑÑÐ½Ð°Ð»Ð¸ÑÑÐ¾Ð² Ð¸ 
Ð¸ÑÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, ÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ¾ÑÑÑ Ð·Ð°ÑÐ¸ÑÐ¸ÑÑ 
ÑÐµÐ±Ñ Ð¾Ñ ÑÐ»ÐµÐ¶ÐºÐ¸ Ð¸ Ð¾ÑÐ²ÐµÐ´Ð¾Ð¼Ð¸ÑÐµÐ»ÐµÐ¹, Ð°ÐºÑÐ¸Ð²Ð¸ÑÑÐ¾Ð² 
Ð¸ Ð¾Ð±ÑÑÐ½ÑÑ Ð»ÑÐ´ÐµÐ¹, ÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ¾ÑÑÑ Ð¾ÑÐºÐ°Ð·Ð°ÑÑÑÑ 
Ð¾Ñ Ð¸Ð½Ð²Ð°Ð·Ð¸Ð²Ð½Ð¾Ð³Ð¾ Ð¾ÑÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ ÑÑÐµÑÑÐµÐ¹ 
ÑÑÐ¾ÑÐ¾Ð½Ð¾Ð¹. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¸Ð´ÐµÑÐ¶Ð¸Ð²Ð°Ð¹ÑÐµÑÑ 
ÑÐµÑÐ¸ÑÐµÐ»ÑÐ½Ð¾Ð¹ Ð¿Ð¾Ð·Ð¸ÑÐ¸Ð¸ Ð² Ð¿Ð¾Ð»ÑÐ·Ñ ÐºÐ¾Ð½ÑÐ¸
 Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÐ¸ ÑÐ¸ÑÑÐ¾Ð²Ð¾Ð³Ð¾ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° Ð¸ 
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð² Ð¸Ð½ÑÐµÑÐ½ÐµÑÐµ Ð¸ ÑÐ°Ð·ÑÐµÑÐ°Ð¹ÑÐµ 
Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ¼ Tor Ð·Ð°ÑÐ¾Ð´Ð¸ÑÑ Ð½Ð° xyz.com. 
Ð¡Ð¿Ð°ÑÐ¸Ð±Ð¾.\"Ð ÑÐ»ÑÑÐ°Ðµ Ñ Ð±Ð°Ð½ÐºÐ°Ð¼Ð¸ Ð¸ Ð´ÑÑÐ³Ð¸Ð¼Ð¸ 
ÑÑÐ²ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½ÑÐ¼Ð¸ Ð²ÐµÐ±-ÑÐ°Ð¹ÑÐ°Ð¼Ð¸ ÑÐ°ÐºÐ¶Ðµ ÑÐ°ÑÑÐ¾ 
Ð½Ð°Ð±Ð»ÑÐ´Ð°ÐµÑÑÑ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ðµ 
Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ (ÐµÑÐ»Ð¸ Ð±Ð°Ð½Ðº Ð·Ð½Ð°ÐµÑ, ÑÑÐ¾ Ð²Ñ 
Ð¾Ð±ÑÑÐ½Ð¾ Ð¾Ð±ÑÐ°ÑÐ°ÐµÑÐµÑÑ Ðº Ð¸Ñ ÑÑÐ»ÑÐ³Ð°Ð¼ Ð¸Ð· Ð¾Ð´Ð½Ð¾Ð¹ 
ÑÑÑÐ°Ð½Ñ Ð¸ Ð²Ð´ÑÑÐ³ Ð²Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ°ÐµÑÐµÑÑ ÑÐµÑÐµÐ· 
ÑÐµÑÑÐ°Ð½ÑÐ»ÑÑÐ¾Ñ Ð½Ð° Ð´ÑÑÐ³Ð¾Ð¹ ÑÑÐ¾ÑÐ¾Ð½Ðµ Ð¼Ð¸ÑÐ°, Ð²Ð°ÑÐ° 
ÑÑÑÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð¸ ÑÑÑÑ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ 
Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ñ Ð¸Ð»Ð¸ Ð·Ð°Ð¼Ð¾ÑÐ¾Ð¶ÐµÐ½Ñ). ÐÑÐ»Ð¸ Ð²Ñ Ð½Ðµ 
Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ Ðº onion-ÑÐ°Ð¹ÑÑ, ÑÐ¼. Ð¯ Ð½Ðµ Ð¼Ð¾Ð³Ñ Ð¾ÑÐºÑÑÑÑ X.onion!"
 },
 "tbb-7-1": {
"id": "#tbb-7-1",

[tor-commits] [translation/support-connecting] Update translations for support-connecting

2018-05-11 Thread translation

commit 108b378081e7a37669e81034a83dd55f8d508ca9
Author: Translation commit bot 
Date:   Fri May 11 20:49:05 2018 +

Update translations for support-connecting
---
 ru.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru.json b/ru.json
index 4d3e7f911..e8844d077 100644
--- a/ru.json
+++ b/ru.json
@@ -8,7 +8,7 @@
 "connecting-2": {
"id": "#connecting-2",
"control": "connecting-2",
-   "title": "I am having trouble connecting to Tor, and I canât figure 
out whatâs wrong.",
+   "title": "Ð£ Ð¼ÐµÐ½Ñ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸ÐµÐ¼ Ðº 
Tor Ð¸ Ñ Ð½Ðµ Ð¼Ð¾Ð³Ñ Ð¿Ð¾Ð½ÑÑÑ, ÑÑÐ¾ Ð½Ðµ ÑÐ°Ðº.",
"description": "If youâre having trouble 
connecting, please select the option to \"copy Tor log to clipboard.\" Then 
paste the Tor log into a text file or other document. You should see one of 
these common log errors (look for the following lines in your Tor 
log):Common log error #1: Proxy connection failure 2017-10-29 09:23:40.800 [NOTICE] Opening Socks 
listener on 127.0.0.1:9150 \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: 
Connecting to directory server \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 
10%: Finishing handshake with directory server \n 2017-10-29 09:24:08.900 
[WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:x (\"general 
SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable 
to connect to xx..xxx..xxx.xx:x  (\"general SOCKS server failure\") \n 
2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect 
toxx..xxx..xxx.xx:x  (\"general SOCKS server fa
 ilure\")If you see lines like these  in 
your Tor log, it means you are failing to connect to a SOCKS proxy. If a SOCKS 
proxy is required for your network setup, then please make sure youâve 
entered your proxy details correctly.  If a SOCKS proxy is not required, or 
youâre not sure,  please try connecting to the Tor network without a SOCKS 
proxy.Common log error #2: Canât reach guard relays 11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks 
listener on 127.0.0.1:9150 \n 11/1/2017 21:11:44 PM.300 [NOTICE] Bootstrapped 
80%: Connecting to the Tor network \n 11/1/2017 21:11:44 PM.300 [WARN] Failed 
to find node for hop 0 of our path. Discarding this circuit. \n 11/1/2017 
21:11:44 PM.500 [NOTICE] Bootstrapped 85%: Finishing handshake with first hop 
\n 11/1/2017 21:11:45 PM.300 [WARN] Failed to find node for hop 0 of our path. 
Discarding this circuit.If you see lines 
like these
  in your Tor log, it means your Tor failed to connect to the first node in the 
Tor circuit. This could mean that youâre on a network thatâs censored. 
Please try connecting with bridges, and that should fix the 
problem.Common log error #3: Failed to complete TLS handshake 13-11-17 19:52:24.300 [NOTICE] Bootstrapped 10%: 
Finishing handshake with directory server \n 13-11-17 19:53:49.300 [WARN] 
Problem bootstrapping. Stuck at 10%: Finishing handshake with directory server. 
(DONE; DONE; count 10; recommendation warn; host [host] at xxx.xxx.xxx.xx:xxx) 
\n 13-11-17 19:53:49.300 [WARN] 10 connections have failed: \n 13-11-17 
19:53:49.300 [WARN]  9 connections died in state handshaking (TLS) with SSL 
state SSLv2/v3 read server hello A in HANDSHAKE \n 13-11-17 19:53:49.300 [WARN] 
 1 connections died in state connect()ing with SSL state (No SSL 
object)If you see lines like this in your 
Tor log, it means that Tor 
 failed to complete a TLS handshake with the directory authorities. Using 
bridges will likely fix this.Common log error #4: Clock skew 19.11.2017 00:04:47.400 [NOTICE] Opening Socks 
listener on 127.0.0.1:9150 \n 19.11.2017 00:04:48.000 [NOTICE] Bootstrapped 5%: 
Connecting to directory server \n 19.11.2017 00:04:48.200 [NOTICE] Bootstrapped 
10%: Finishing handshake with directory server \n 19.11.2017 00:04:48.800 
[WARN] Received NETINFO cell with skewed time (OR:xxx.xx.x.xx:): It seems 
that our clock is behind by 1 days, 0 hours, 1 minutes, or that theirs is 
ahead. \n Tor requires an accurate clock to work: please check your time, 
timezone, and date settings.If you see lines 
like this in your Tor log, it means your system clock is incorrect. Please make 
sure your clock is set accurately, including the correct timezone. Then restart 
Tor. "
 },
 "connecting-3": {

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

[tor-commits] [translation/support-gettor] Update translations for support-gettor

2018-05-11 Thread translation

commit 321117aa729fa8340dbb94328728e6886d6848bf
Author: Translation commit bot 
Date:   Fri May 11 20:49:20 2018 +

Update translations for support-gettor
---
 ru.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru.json b/ru.json
index 65995023b..7a0de4033 100644
--- a/ru.json
+++ b/ru.json
@@ -9,7 +9,7 @@
"id": "#gettor-2",
"control": "gettor-2",
"title": "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ GetTor ÑÐµÑÐµÐ· 
ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÑ Ð¿Ð¾ÑÑÑ.",
-   "description": "Send an email to 
get...@torproject.org. Write your operating system (such as windows, MacOS (OS 
X), or linux) in the body of the message and send. GetTor will respond with an 
email containing links from which you can download Tor Browser, the 
cryptographic signature (needed for verifying the download) [link to glossary 
definition of cryptographic signature; instructions for verification], the 
fingerprint of the key used to make the signature, and the packageâs 
checksum. You may be offered a choice of \"32-bit\" or \"64-bit\" software: 
this depends on the model of the computer you are using; consult documentation 
about your computer to find out more."
+   "description": "ÐÐ°Ð¿Ð¸ÑÐ¸ÑÐµ Ð¿Ð¸ÑÑÐ¼Ð¾ Ð½Ð° 
Ð°Ð´ÑÐµÑ get...@torproject.org. Ð£ÐºÐ°Ð¶Ð¸ÑÐµ Ð² ÑÐµÐ»Ðµ Ð¿Ð¸ÑÑÐ¼Ð° 
ÑÐ²Ð¾Ñ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ (Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, windows, 
MacOS (OS X) Ð¸Ð»Ð¸ linux) Ð¸ Ð¾ÑÐ¿ÑÐ°Ð²ÑÑÐµ. GetTor Ð¾ÑÐ²ÐµÑÐ¸Ñ Ð¿Ð¾ 
ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÐµ Ð¿Ð¸ÑÑÐ¼Ð¾Ð¼, ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÐ¸Ð¼ 
ÑÑÑÐ»ÐºÐ¸, Ð¿Ð¾ ÐºÐ¾ÑÐ¾ÑÑÐ¼ Ð²Ñ ÑÐ¼Ð¾Ð¶ÐµÑÐµ ÑÐºÐ°ÑÐ°ÑÑ Tor 
Browser, ÐºÑÐ¸Ð¿ÑÐ¾Ð³ÑÐ°ÑÐ¸ÑÐµÑÐºÑÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ (Ð½ÐµÐ¾Ð±Ñ
Ð¾Ð´Ð¸Ð¼ÑÑ Ð´Ð»Ñ Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸) [ÑÑÑÐ»ÐºÐ° Ð½Ð° 
Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð³Ð»Ð¾ÑÑÐ°ÑÐ¸Ñ ÐºÑÐ¸Ð¿ÑÐ¾Ð³ÑÐ°ÑÐ¸ÑÐµÑÐºÐ¾Ð¹ 
Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸; Ð¸Ð½ÑÑÑÑÐºÑÐ¸Ð¸ Ð¿Ð¾ Ð¿ÑÐ¾Ð²ÐµÑÐºÐµ], Ð¾ÑÐ¿ÐµÑÐ°ÑÐ¾Ðº 
ÐºÐ»ÑÑÐ°, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÐ¼Ð¾Ð³Ð¾ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸, Ð¸ 
ÐºÐ¾Ð½ÑÑÐ¾Ð»ÑÐ½ÑÐµ ÑÑÐ¼Ð¼Ñ Ð¿Ð°ÐºÐµÑÐ°. ÐÐ°Ð¼ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ 
Ð¿ÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½ Ð²ÑÐ±Ð¾Ñ 32- Ð¸Ð»Ð¸ 64-Ð±Ð¸ÑÐ½Ð¾Ð¹ Ð²ÐµÑÑÐ¸Ð¸ 
Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ Ð¾Ð±ÐµÑÐ¿ÐµÑÐµÐ½Ð
 ¸Ñ: ÑÑÐ¾ Ð·Ð°Ð²Ð¸ÑÐ¸Ñ Ð¾Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÐ¼Ð¾Ð³Ð¾ 
ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°; Ð¾Ð±ÑÐ°ÑÐ¸ÑÐµÑÑ Ðº Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸ Ð¾ 
Ð²Ð°ÑÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ, ÑÑÐ¾Ð±Ñ ÑÐ·Ð½Ð°ÑÑ Ð±Ð¾Ð»ÑÑÐµ."
 },
 "gettor-3": {
"id": "#gettor-3",

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

[tor-commits] [tor/master] get rid of whitespace before #ifdef's

2018-05-11 Thread arma

commit 962c2f87766f200eb364e839038fafe50ddb0a93
Author: Roger Dingledine 
Date:   Fri May 11 16:27:55 2018 -0400

get rid of whitespace before #ifdef's

i don't know if whitespace is ok to have before preprocessing
directives on all platforms, but anyway we almost never have it,
so now things are more uniform.
---
 src/or/control.c | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/or/control.c b/src/or/control.c
index 6f87f5ab5..9323173f5 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1861,24 +1861,24 @@ getinfo_helper_misc(control_connection_t *conn, const 
char *question,
   } else if (!strcmp(question, "process/pid")) {
 int myPid = -1;
 
-#ifdef _WIN32
+#ifdef _WIN32
   myPid = _getpid();
-#else
+#else
   myPid = getpid();
-#endif
+#endif
 
 tor_asprintf(answer, "%d", myPid);
   } else if (!strcmp(question, "process/uid")) {
-#ifdef _WIN32
+#ifdef _WIN32
   *answer = tor_strdup("-1");
-#else
+#else
   int myUid = geteuid();
   tor_asprintf(answer, "%d", myUid);
 #endif /* defined(_WIN32) */
   } else if (!strcmp(question, "process/user")) {
-#ifdef _WIN32
+#ifdef _WIN32
   *answer = tor_strdup("");
-#else
+#else
   int myUid = geteuid();
   const struct passwd *myPwEntry = tor_getpwuid(myUid);
 

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

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

2018-05-11 Thread translation

commit 13761ce9fc47d63439e0714f92d6f4aa82ed49df
Author: Translation commit bot 
Date:   Fri May 11 18:15:20 2018 +

Update translations for whisperback
---
 el/el.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/el/el.po b/el/el.po
index b1bcad936..00c67c2cc 100644
--- a/el/el.po
+++ b/el/el.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2018-04-12 18:55+\n"
-"Last-Translator: Elektra M. \n"
+"PO-Revision-Date: 2018-05-11 17:53+\n"
+"Last-Translator: Dimitris Maroulidis \n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2018-05-11 Thread translation

commit 91799146ee4d0e844282e842637c2e7890949019
Author: Translation commit bot 
Date:   Fri May 11 18:15:27 2018 +

Update translations for whisperback_completed
---
 el/el.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/el/el.po b/el/el.po
index b1bcad936..00c67c2cc 100644
--- a/el/el.po
+++ b/el/el.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2018-04-12 18:55+\n"
-"Last-Translator: Elektra M. \n"
+"PO-Revision-Date: 2018-05-11 17:53+\n"
+"Last-Translator: Dimitris Maroulidis \n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [exonerator/master] Add change log entry for #26032.

2018-05-11 Thread karsten

commit 84b073611ef72d84b58ce1b6cf7aa57afc473abe
Author: Karsten Loesing 
Date:   Fri May 11 17:14:45 2018 +0200

Add change log entry for #26032.
---
 CHANGELOG.md | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bc4d1d..6b80bf4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Changes in version 2.0.3 - 2018-0?-??
+
+ * Minor changes
+   - Remove duplicate [] surrounding suggested IPv6 addresses.
+
+
 # Changes in version 2.0.2 - 2017-12-20
 
  * Major changes

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

[tor-commits] [exonerator/master] Avoid adding superfluous brackets in suggestion links.

2018-05-11 Thread karsten

commit fa80fff479cfd10359283e4e40e23b59bc109b50
Author: iwakeh 
Date:   Tue Jan 9 09:25:13 2018 +

Avoid adding superfluous brackets in suggestion links.

Also add a test checking for superfluous brackets.
Fixes task-26032.
---
 .../metrics/exonerator/ExoneraTorServlet.java  |  8 +--
 .../metrics/exonerator/ExoneraTorServletTest.java  | 58 ++
 2 files changed, 62 insertions(+), 4 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java 
b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
index 8f114eb..659f494 100644
--- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
+++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
@@ -466,7 +466,7 @@ public class ExoneraTorServlet extends HttpServlet {
 contactLink);
   }
 
-  private void writeSummaryAddressesInSameNetwork(PrintWriter out,
+  void writeSummaryAddressesInSameNetwork(PrintWriter out,
   ResourceBundle rb, String relayIp, String timestampStr, String langStr,
   List addressesInSameNetwork) throws IOException {
 Object[][] panelItems = new Object[addressesInSameNetwork.size()][];
@@ -475,10 +475,10 @@ public class ExoneraTorServlet extends HttpServlet {
   String link;
   String address;
   if (addressInSameNetwork.contains(":")) {
+address = addressInSameNetwork.replaceAll("[\\[\\]]", "");
 link = String.format("/?ip=[%s]=%s=%s",
-addressInSameNetwork.replaceAll(":", "%3A"), timestampStr,
-langStr);
-address = "[" + addressInSameNetwork + "]";
+address.replaceAll(":", "%3A"), timestampStr, langStr);
+address = "[" + address + "]";
   } else {
 link = String.format("/?ip=%s=%s=%s",
 addressInSameNetwork, timestampStr, langStr);
diff --git 
a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java 
b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java
index 81d6d3c..34dfd42 100644
--- a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java
+++ b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java
@@ -4,9 +4,17 @@
 package org.torproject.metrics.exonerator;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
 public class ExoneraTorServletTest {
 
   private static final String[][] ipTestData
@@ -32,5 +40,55 @@ public class ExoneraTorServletTest {
   assertEquals(data[1], ExoneraTorServlet.parseIpParameter(data[0]));
 }
   }
+
+  @Test
+  public void testNearbyIpV6Response() throws Exception {
+ExoneraTorServlet es = new ExoneraTorServlet();
+ResourceBundle rb = ResourceBundle
+.getBundle("ExoneraTor", Locale.forLanguageTag("en"));
+for (QueryResponse qr : qrs) {
+  StringWriter sw = new StringWriter();
+  es.writeSummaryAddressesInSameNetwork(new PrintWriter(sw), rb,
+  qr.queryAddress, qr.queryDate, "en",
+  Arrays.asList(qr.nearbyAddresses));
+  String errorMsg = "Test data:" + QueryResponse.toJson(qr)
+  + "\nresult:\n" + sw.toString();
+  assertTrue(errorMsg,
+  sw.toString().contains("Result is negative"));
+  assertTrue(errorMsg,
+  sw.toString().contains("ip=[2a06%3Ae80%3A1%3A%3A10]&"));
+  assertTrue(errorMsg,
+  sw.toString().contains("ip=[2a06%3Ae80%3A1%3A%3A15]&"));
+}
+  }
+
+  private QueryResponse[] qrs = new QueryResponse[]{
+  QueryResponse.fromJson(new StringReader(
+  "{\"version\":\"1.0\","
+  + "\"query_address\":\"2a06:e80:1::11\","
+  + "\"query_date\":\"2016-12-12\","
+  + "\"first_date_in_database\":\"2016-01-01\","
+  + "\"last_date_in_database\":\"2016-12-31\","
+  + "\"relevant_statuses\":false,"
+  + "\"nearby_addresses\":[\"2a06:e80:1::10\","
+  + "\"2a06:e80:1::15\"]}")),
+  QueryResponse.fromJson(new StringReader(
+  "{\"version\":\"1.0\","
+  + "\"query_address\":\"2a06:e80:1::11\","
+  + "\"query_date\":\"2016-12-12\","
+  + "\"first_date_in_database\":\"2016-01-01\","
+  + "\"last_date_in_database\":\"2016-12-31\","
+  + "\"relevant_statuses\":false,"
+  + "\"nearby_addresses\":[\"[2a06:e80:1::10]\","
+  + "\"2a06:e80:1::15\"]}")),
+  QueryResponse.fromJson(new StringReader(
+  "{\"version\":\"1.0\","
+  + "\"query_address\":\"2a06:e80:1::11\","
+  + "\"query_date\":\"2016-12-12\","
+  + "\"first_date_in_database\":\"2016-01-01\","
+  + "\"last_date_in_database\":\"2016-12-31\","
+  +

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

2018-05-11 Thread translation

commit 7aae04ec798fb54967f124add72e53c06ec120d2
Author: Translation commit bot 
Date:   Fri May 11 14:46:49 2018 +

Update translations for tails-misc
---
 de.po | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/de.po b/de.po
index 24085bd40..0c29419e1 100644
--- a/de.po
+++ b/de.po
@@ -30,7 +30,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-04-16 10:17+\n"
+"PO-Revision-Date: 2018-05-11 14:30+\n"
 "Last-Translator: spriver\n"
 "Language-Team: German 
(http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -62,18 +62,18 @@ msgid ""
 "an opportunity for eavesdroppers, like your email or Internet provider, to\n"
 "confirm that you are using Tails.\n"
 "\n"
-msgstr "Helfen uns Ihren Fehler zu beheben!\nLesen Sie unsere Fehlerberichtanleitung.\nGeben Sie nur 
soviele persÃ¶nliche Informationen an,\nwie unbedingt 
notwendig!\nÃber die Angabe von Email-Adressen\n\nDie 
Angabe einer Email-Adresse erlaubt uns, Sie zu kontaktieren um das Problem\nzu 
klÃ¤ren. Dies ist notwendig fÃ¼r die groÃe Mehrheit der erhaltenen Berichte, 
da die\nmeisten Berichte ohne Kontaktinformationen nutzlos sind. Andererseits 
ist dies eine\nEinladung fÃ¼r bÃ¶swillige Dritte, wie Ihr Email- oder 
Internetprovider, um herauszufinden,\ndass Sie Tails nutzen.\n"
+msgstr "Helfen uns Ihren Fehler zu beheben!\nLesen Sie unsere Fehlerberichtanleitung.\nGeben Sie nur 
soviele persÃ¶nliche Informationen an,\nwie unbedingt 
notwendig!\nÃber die Angabe von Email-Adressen\n\nDie 
Angabe einer Email-Adresse erlaubt uns, Sie zu kontaktieren, um das Problem\nzu 
klÃ¤ren. Dies ist fÃ¼r die groÃe Mehrheit der erhaltenen Berichte notwendig, 
da die\nmeisten Berichte ohne Kontaktinformationen nutzlos sind. Andererseits 
ist dies eine\nEinladung fÃ¼r bÃ¶swillige Dritte, wie Ihren Email- oder 
Internetprovider, um herauszufinden,\ndass Sie Tails nutzen.\n"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"
-msgstr "BestÃ¤ndiges Speichern ist fÃ¼r Electrum deaktiviert."
+msgstr "BestÃ¤ndiges Speicherbereich ist fÃ¼r Electrum deaktiviert."
 
 #: config/chroot_local-includes/usr/local/bin/electrum:59
 msgid ""
 "When you reboot Tails, all of Electrum's data will be lost, including your "
 "Bitcoin wallet. It is strongly recommended to only run Electrum when its "
 "persistence feature is activated."
-msgstr "Wenn Sie Tails neu starten, werden alle Daten von Electrum gelÃ¶scht, 
inklusive Ihrer Bitcoin-GeldbÃ¶rse. Wir empfehlen eindringlich, Electrum mit 
aktiviertem bestÃ¤ndigen Speicherbereich zu nutzen."
+msgstr "Wenn Sie Tails neu starten, werden alle Daten von Electrum gelÃ¶scht, 
inklusive Ihrer Bitcoin-GeldbÃ¶rse. Wir empfehlen eindringlich, Electrum 
ausschlieÃlich mit aktiviertem bestÃ¤ndigen Speicherbereich zu nutzen."
 
 #: config/chroot_local-includes/usr/local/bin/electrum:60
 msgid "Do you want to start Electrum anyway?"
@@ -158,7 +158,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:201
 msgid "Your additional software are up to date"
-msgstr "Die zusÃ¤tzlichen Anwendungen sind auf dem neuesten Stand"
+msgstr "Die zusÃ¤tzlichen Anwendungen sind auf dem aktuellsten Stand"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:202
 msgid "The upgrade was successful."
@@ -284,7 +284,7 @@ msgid ""
 "monitor what you are doing in Tails. Only free software can be considered "
 "trustworthy, for both the host operating system and the virtualization "
 "software."
-msgstr "Sowohl das Wirts-Betriebssystem als auch die 
Virtualisierungs-Anwendung kÃ¶nnen Ã¼berwachen, was Sie in Tails machen. Nur 
Freie Software kann sowohl fÃ¼r das Wirts-Betriebssystem als auch fÃ¼r die 
Virtualisierungs-Anwendung als vertrauenswÃ¼rdig gelten."
+msgstr "Sowohl das Wirts-Betriebssystem als auch die 
Virtualisierungs-Anwendung kÃ¶nnen Ã¼berwachen, was Sie in Tails tun. Nur Freie 
Software kann sowohl fÃ¼r das Wirts-Betriebssystem als auch fÃ¼r die 
Virtualisierungs-Anwendung als vertrauenswÃ¼rdig gelten."
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:83
 msgid "Learn more"
@@ -311,7 +311,7 @@ msgid ""
 "Network activity within the Unsafe Browser is not anonymous.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
-msgstr "Die NetzwerkaktivitÃ¤t im unsicheren Browser ist nicht anonym. 
Benutzen Sie den unsicheren Browser nur wenn nÃ¶tig, z.B. wenn Sie sich 
einloggen oder registrieren mÃ¼ssen, um Ihre Internetverbindung zu aktivieren."
+msgstr "Die NetzwerkaktivitÃ¤t im unsicheren Browser ist nicht 
anonym.\\nBenutzen Sie den unsicheren Browser nur wenn nÃ¶tig, z.B. wenn 
Sie sich einloggen oder registrieren mÃ¼ssen, um Ihre

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

2018-05-11 Thread translation

commit 1f6f517a5ce062241434335290eec3c45a2079ab
Author: Translation commit bot 
Date:   Fri May 11 14:18:34 2018 +

Update translations for tails-greeter-2_completed
---
 de/de.po | 27 ++-
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/de/de.po b/de/de.po
index 425589035..a7177db79 100644
--- a/de/de.po
+++ b/de/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-01 20:26+0100\n"
+"POT-Creation-Date: 2018-05-07 19:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: max weber, 2017\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
@@ -94,7 +94,8 @@ msgstr "MAC-Adressen nicht manipulieren"
 #: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
-"VerschlÃ¼sselter Speicher kann mit dieser Passphrase nicht entsperrt werden."
+"VerschlÃ¼sselter Speicherbereich kann mit dieser Passphrase nicht entsperrt "
+"werden."
 
 #: ../data/greeter.ui.h:18
 msgid ""
@@ -127,7 +128,7 @@ msgstr "Vorgabeeinstellungen"
 
 #: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
-msgstr "Sprache & Regionseinstellungen speichern"
+msgstr "Sprache- und Regionseinstellungen speichern"
 
 #: ../data/greeter.ui.h:25
 msgid "_Language"
@@ -147,7 +148,7 @@ msgstr "_Zeitzone"
 
 #: ../data/greeter.ui.h:29
 msgid "Encrypted _Persistent Storage"
-msgstr "VerschlÃ¼sselte _bestÃ¤ndige Datenpartition"
+msgstr "VerschlÃ¼sselter _bestÃ¤ndiger Speicherbereich"
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -155,12 +156,12 @@ msgstr "Passphrase anzeigen"
 
 #: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
-msgstr "BestÃ¤ndige Datenpartition konfigurieren"
+msgstr "BestÃ¤ndigen Speicherbereich konfigurieren"
 
 #: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
-"Geben Sie Ihre Passphrase ein, um die bestÃ¤ndige Datenpartition zu "
+"Geben Sie Ihre Passphrase ein, um die bestÃ¤ndigen Speicherbereich zu "
 "entsperren"
 
 #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
@@ -170,13 +171,13 @@ msgstr "Entsperren"
 
 #: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
-msgstr "BestÃ¤ndige Datenpartition wieder sperren"
+msgstr "BestÃ¤ndigen Speicherbereich wieder sperren"
 
 #: ../data/greeter.ui.h:35
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
-"Ihre bestÃ¤ndige Datenpartition ist entsperrt. Starten Sie Tails neu, um sie "
-"wieder zu sperren."
+"Ihr bestÃ¤ndiger Speicherbereich ist entsperrt. Starten Sie Tails neu, um ihn"
+" wieder zu sperren."
 
 #: ../data/greeter.ui.h:36
 msgid "_Additional Settings"
@@ -223,7 +224,7 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 "Die Standardeinstellungen sind in den meisten Situationen sicher. Um "
-"benutzerdefinierte Einstellungen vorzunehmen, drÃ¼cken Sie unten auf die "
+"benutzerdefinierte Einstellungen vorzunehmen, klicken Sie unten auf die "
 "SchaltflÃ¤che Â»+Â«."
 
 #: ../data/greeter.ui.h:45
@@ -256,7 +257,7 @@ msgstr "_Windows-Tarnung"
 
 #: ../tailsgreeter/gui.py:391
 msgid "Bridge & Proxy"
-msgstr "BrÃ¼cke & Vermittlungsserver"
+msgstr "BrÃ¼cke und Vermittlungsserver"
 
 #: ../tailsgreeter/gui.py:397
 msgid "Offline"
@@ -264,11 +265,11 @@ msgstr "Offline"
 
 #: ../tailsgreeter/gui.py:481
 msgid "Failed to relock persistent storage."
-msgstr "BestÃ¤ndige Datenpartition konnte nicht wieder gesperrt werden."
+msgstr "BestÃ¤ndiger Speicherbereich konnte nicht wieder gesperrt werden."
 
 #: ../tailsgreeter/gui.py:499
 msgid "Unlockingâ¦"
-msgstr "Wird entsperrt â¦"
+msgstr "Wird entsperrtâ¦"
 
 #: ../tailsgreeter/gui.py:594
 msgid "Additional Settings"

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

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

2018-05-11 Thread translation

commit 70860b10bd3f4f77688eea31bd79e4afc247959d
Author: Translation commit bot 
Date:   Fri May 11 14:18:29 2018 +

Update translations for tails-greeter-2
---
 de/de.po | 27 ++-
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/de/de.po b/de/de.po
index 425589035..a7177db79 100644
--- a/de/de.po
+++ b/de/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-01 20:26+0100\n"
+"POT-Creation-Date: 2018-05-07 19:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: max weber, 2017\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
@@ -94,7 +94,8 @@ msgstr "MAC-Adressen nicht manipulieren"
 #: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
-"VerschlÃ¼sselter Speicher kann mit dieser Passphrase nicht entsperrt werden."
+"VerschlÃ¼sselter Speicherbereich kann mit dieser Passphrase nicht entsperrt "
+"werden."
 
 #: ../data/greeter.ui.h:18
 msgid ""
@@ -127,7 +128,7 @@ msgstr "Vorgabeeinstellungen"
 
 #: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
-msgstr "Sprache & Regionseinstellungen speichern"
+msgstr "Sprache- und Regionseinstellungen speichern"
 
 #: ../data/greeter.ui.h:25
 msgid "_Language"
@@ -147,7 +148,7 @@ msgstr "_Zeitzone"
 
 #: ../data/greeter.ui.h:29
 msgid "Encrypted _Persistent Storage"
-msgstr "VerschlÃ¼sselte _bestÃ¤ndige Datenpartition"
+msgstr "VerschlÃ¼sselter _bestÃ¤ndiger Speicherbereich"
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -155,12 +156,12 @@ msgstr "Passphrase anzeigen"
 
 #: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
-msgstr "BestÃ¤ndige Datenpartition konfigurieren"
+msgstr "BestÃ¤ndigen Speicherbereich konfigurieren"
 
 #: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
-"Geben Sie Ihre Passphrase ein, um die bestÃ¤ndige Datenpartition zu "
+"Geben Sie Ihre Passphrase ein, um die bestÃ¤ndigen Speicherbereich zu "
 "entsperren"
 
 #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
@@ -170,13 +171,13 @@ msgstr "Entsperren"
 
 #: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
-msgstr "BestÃ¤ndige Datenpartition wieder sperren"
+msgstr "BestÃ¤ndigen Speicherbereich wieder sperren"
 
 #: ../data/greeter.ui.h:35
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
-"Ihre bestÃ¤ndige Datenpartition ist entsperrt. Starten Sie Tails neu, um sie "
-"wieder zu sperren."
+"Ihr bestÃ¤ndiger Speicherbereich ist entsperrt. Starten Sie Tails neu, um ihn"
+" wieder zu sperren."
 
 #: ../data/greeter.ui.h:36
 msgid "_Additional Settings"
@@ -223,7 +224,7 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 "Die Standardeinstellungen sind in den meisten Situationen sicher. Um "
-"benutzerdefinierte Einstellungen vorzunehmen, drÃ¼cken Sie unten auf die "
+"benutzerdefinierte Einstellungen vorzunehmen, klicken Sie unten auf die "
 "SchaltflÃ¤che Â»+Â«."
 
 #: ../data/greeter.ui.h:45
@@ -256,7 +257,7 @@ msgstr "_Windows-Tarnung"
 
 #: ../tailsgreeter/gui.py:391
 msgid "Bridge & Proxy"
-msgstr "BrÃ¼cke & Vermittlungsserver"
+msgstr "BrÃ¼cke und Vermittlungsserver"
 
 #: ../tailsgreeter/gui.py:397
 msgid "Offline"
@@ -264,11 +265,11 @@ msgstr "Offline"
 
 #: ../tailsgreeter/gui.py:481
 msgid "Failed to relock persistent storage."
-msgstr "BestÃ¤ndige Datenpartition konnte nicht wieder gesperrt werden."
+msgstr "BestÃ¤ndiger Speicherbereich konnte nicht wieder gesperrt werden."
 
 #: ../tailsgreeter/gui.py:499
 msgid "Unlockingâ¦"
-msgstr "Wird entsperrt â¦"
+msgstr "Wird entsperrtâ¦"
 
 #: ../tailsgreeter/gui.py:594
 msgid "Additional Settings"

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

1 2 >

1 - 100 of 108 matches

Mail list logo