[tor-commits] [tor-browser-bundle/master] Add stopgap for shipping HTTPS-Everywhere.
commit 35411af55b92ee4d1c823aaefc5a5062ac940787
Author: Georg Koppen g...@torproject.org
Date: Fri May 2 09:17:54 2014 +
Add stopgap for shipping HTTPS-Everywhere.
Until bug 11630 is fixed we add a better stopgap than shipping
outdated HTTPS-Everywhere versions: we take the NoScript route and
download and use the .xpi made by the EFF.
---
gitian/descriptors/linux/gitian-bundle.yml | 11 ++-
gitian/descriptors/mac/gitian-bundle.yml | 11 ++-
gitian/descriptors/windows/gitian-bundle.yml | 11 ++-
gitian/fetch-inputs.sh |6 --
gitian/versions.beta |4
gitian/versions.nightly |4
6 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/gitian/descriptors/linux/gitian-bundle.yml
b/gitian/descriptors/linux/gitian-bundle.yml
index c16589a..006883c 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -41,6 +41,7 @@ files:
- linux-skeleton.zip
- linux-langpacks.zip
- noscr...@noscript.net.xpi
+- https-everywh...@eff.org.xpi
- dzip.sh
- dtar.sh
- bare-version
@@ -88,13 +89,13 @@ script: |
~/build/dzip.sh
../../../tor-browser/Data/Browser/profile.default/extensions/torbut...@torproject.org.xpi
.
cd ../../../
#
- cd https-everywhere
+ #cd https-everywhere
# XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in
# makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
- rm -f .git/refs/heads/master
- ./makexpi.sh
- cp pkg/*.xpi
../tor-browser/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
- cd ..
+ #rm -f .git/refs/heads/master
+ #./makexpi.sh
+ #cp pkg/*.xpi
../tor-browser/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
+ #cd ..
#
cp *.xpi tor-browser/Data/Browser/profile.default/extensions/
cd tor-browser/Data/Browser/profile.default/extensions
diff --git a/gitian/descriptors/mac/gitian-bundle.yml
b/gitian/descriptors/mac/gitian-bundle.yml
index 263ca57..2668c7d 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -41,6 +41,7 @@ files:
- dmg-desktop.tar.xz
- mac-langpacks.zip
- noscr...@noscript.net.xpi
+- https-everywh...@eff.org.xpi
- dzip.sh
- ddmg.sh
- libdmg.patch
@@ -95,13 +96,13 @@ script: |
~/build/dzip.sh
../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/torbut...@torproject.org.xpi
.
cd ../../../
#
- cd https-everywhere
+ # cd https-everywhere
# XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in
# makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
- rm -f .git/refs/heads/master
- ./makexpi.sh
- cp pkg/*.xpi
../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
- cd ..
+ # rm -f .git/refs/heads/master
+ # ./makexpi.sh
+ # cp pkg/*.xpi
../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
+ # cd ..
#
cp *.xpi ./$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/
cd $TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/
diff --git a/gitian/descriptors/windows/gitian-bundle.yml
b/gitian/descriptors/windows/gitian-bundle.yml
index 457fa7b..ebde49b 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -37,6 +37,7 @@ files:
- windows-skeleton.zip
- win32-langpacks.zip
- noscr...@noscript.net.xpi
+- https-everywh...@eff.org.xpi
- dzip.sh
- bare-version
- bundle.inputs
@@ -78,13 +79,13 @@ script: |
~/build/dzip.sh ../../../tbb-windows-installer/Tor
Browser/Data/Browser/profile.default/extensions/torbut...@torproject.org.xpi .
cd ../../../
#
- cd https-everywhere
+ #cd https-everywhere
# XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in
# makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
- rm -f .git/refs/heads/master
- ./makexpi.sh
- cp ./pkg/*.xpi ../tbb-windows-installer/Tor
Browser/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
- cd ..
+ #rm -f .git/refs/heads/master
+ #./makexpi.sh
+ #cp ./pkg/*.xpi ../tbb-windows-installer/Tor
Browser/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
+ #cd ..
#
cp *.xpi tbb-windows-installer/Tor
Browser/Data/Browser/profile.default/extensions
cd tbb-windows-installer/Tor
Browser/Data/Browser/profile.default/extensions
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index f80348e..b542cf0 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -206,8 +206,9 @@ done
cd ..
-# NoScript and PDF.JS are magikal and special:
+# NoScript and HTTPS-Everywhere are magikal and special:
wget -U -N ${NOSCRIPT_URL}
+wget -U -N ${HTTPSE_URL}
# So is mingw:
if [ ! -f
[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties
commit 99a0e9496cbfc723a10ee798810839b43c286860 Author: Translation commit bot translat...@torproject.org Date: Fri May 2 13:46:49 2014 + Update translations for tor-launcher-properties --- ca/torlauncher.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/torlauncher.properties b/ca/torlauncher.properties index c423d03..d2e1d15 100644 --- a/ca/torlauncher.properties +++ b/ca/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=les identitats no coincideixen torlauncher.bootstrapWarning.timeout=S'ha excedit el temps d'espera de connexió torlauncher.bootstrapWarning.noroute=no hi ha ruta cap al servidor torlauncher.bootstrapWarning.ioerror=error de lectura/escriptura -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=falta de transport afegible ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
commit 107e2db40df1615cb0791f8171193c8aca2579b9 Author: Translation commit bot translat...@torproject.org Date: Fri May 2 13:46:54 2014 + Update translations for tor-launcher-properties_completed --- ca/torlauncher.properties |1 + 1 file changed, 1 insertion(+) diff --git a/ca/torlauncher.properties b/ca/torlauncher.properties index c4ad782..d2e1d15 100644 --- a/ca/torlauncher.properties +++ b/ca/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=les identitats no coincideixen torlauncher.bootstrapWarning.timeout=S'ha excedit el temps d'espera de connexió torlauncher.bootstrapWarning.noroute=no hi ha ruta cap al servidor torlauncher.bootstrapWarning.ioerror=error de lectura/escriptura +torlauncher.bootstrapWarning.pt_missing=falta de transport afegible ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] clean up wizard context use
commit d5293340d56799b79d0a8f3389851d54b31f92de
Author: Nathan Freitas nat...@freitas.net
Date: Fri Apr 25 12:42:31 2014 -0400
clean up wizard context use
---
.../android/wizard/ChooseLocaleWizardActivity.java | 19 ---
.../android/wizard/ConfigureTransProxy.java |9 +
src/org/torproject/android/wizard/LotsaText.java|9 +
src/org/torproject/android/wizard/Permissions.java | 15 ---
.../torproject/android/wizard/TipsAndTricks.java|6 +++---
5 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java
b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java
index 7d7f7cd..6385227 100644
--- a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java
+++ b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java
@@ -4,6 +4,7 @@ import java.util.Locale;
import org.torproject.android.R;
import org.torproject.android.TorConstants;
+import org.torproject.android.service.TorServiceUtils;
import android.app.Activity;
import android.content.Context;
@@ -22,14 +23,12 @@ import android.widget.ListView;
public class ChooseLocaleWizardActivity extends Activity implements
TorConstants {
- private Context context;
private int flag = 0;
private ListView listLocales;
protected void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
-context = this;
}
@@ -47,21 +46,11 @@ public class ChooseLocaleWizardActivity extends Activity
implements TorConstants
protected void onResume() {
super.onResume();
-setupUI();
-
}
- private void setupUI ()
- {
-// SharedPreferences prefs =
PreferenceManager.getDefaultSharedPreferences(context);
-
-
- }
-
-
private void stepSix(){
listLocales =
(ListView)findViewById(R.id.wizard_locale_list);
@@ -84,7 +73,7 @@ public class ChooseLocaleWizardActivity extends Activity
implements TorConstants
int arg2, long arg3) {
setLocalePref(arg2);
- startActivityForResult(new
Intent(getBaseContext(), LotsaText.class), 1);
+ startActivityForResult(new
Intent(ChooseLocaleWizardActivity.this, LotsaText.class), 1);
}
});
@@ -94,7 +83,7 @@ public class ChooseLocaleWizardActivity extends Activity
implements TorConstants
public void onClick(View v) {
- startActivityForResult(new
Intent(getBaseContext(), LotsaText.class), 1);
+ startActivityForResult(new
Intent(ChooseLocaleWizardActivity.this, LotsaText.class), 1);
}
});
@@ -106,7 +95,7 @@ public class ChooseLocaleWizardActivity extends Activity
implements TorConstants
private void setLocalePref(int selId)
{
- SharedPreferences prefs =
PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+ SharedPreferences prefs =
TorServiceUtils.getSharedPrefs(getApplicationContext());
Configuration config = getResources().getConfiguration();
diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java
b/src/org/torproject/android/wizard/ConfigureTransProxy.java
index 856fd0f..abbaee6 100644
--- a/src/org/torproject/android/wizard/ConfigureTransProxy.java
+++ b/src/org/torproject/android/wizard/ConfigureTransProxy.java
@@ -7,6 +7,7 @@ import org.torproject.android.R.drawable;
import org.torproject.android.R.id;
import org.torproject.android.R.layout;
import org.torproject.android.R.string;
+import org.torproject.android.service.TorServiceUtils;
import org.torproject.android.settings.AppManager;
import android.app.Activity;
@@ -76,7 +77,7 @@ public class ConfigureTransProxy extends Activity implements
TorConstants {
private void setupUI ()
{
- SharedPreferences prefs =
PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+ SharedPreferences prefs =
TorServiceUtils.getSharedPrefs(getApplicationContext());
boolean transEnabled = prefs.getBoolean(PREF_TRANSPARENT,
false);
@@ -119,7 +120,7 @@ public class ConfigureTransProxy extends Activity
implements TorConstants {
[tor-commits] [orbot/master] install obfsclient binary
commit f485015f8380f77100f505f605b34603a8d3043d
Author: Nathan Freitas nat...@freitas.net
Date: Thu Apr 24 12:30:23 2014 -0400
install obfsclient binary
---
src/org/torproject/android/service/TorResourceInstaller.java |4 ++--
src/org/torproject/android/service/TorService.java |2 +-
src/org/torproject/android/service/TorServiceConstants.java |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/org/torproject/android/service/TorResourceInstaller.java
b/src/org/torproject/android/service/TorResourceInstaller.java
index 799bdae..1b844ca 100644
--- a/src/org/torproject/android/service/TorResourceInstaller.java
+++ b/src/org/torproject/android/service/TorResourceInstaller.java
@@ -102,8 +102,8 @@ public class TorResourceInstaller implements
TorServiceConstants {
shell.add(new SimpleCommand(COMMAND_RM_FORCE +
outFile.getAbsolutePath())).waitForFinish();
streamToFile(is,outFile, false, true);
- is = context.getResources().openRawResource(R.raw.obfsproxy);
- outFile = new File(installFolder, OBFSPROXY_ASSET_KEY);
+ is = context.getResources().openRawResource(R.raw.obfsclient);
+ outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY);
shell.add(new SimpleCommand(COMMAND_RM_FORCE +
outFile.getAbsolutePath())).waitForFinish();
streamToFile(is,outFile, false, true);
diff --git a/src/org/torproject/android/service/TorService.java
b/src/org/torproject/android/service/TorService.java
index 976404e..3825fa4 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -532,7 +532,7 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
filePrivoxy = new File(appBinHome, PRIVOXY_ASSET_KEY);
- fileObfsProxy = new File(appBinHome, OBFSPROXY_ASSET_KEY);
+ fileObfsProxy = new File(appBinHome, OBFSCLIENT_ASSET_KEY);
fileTorRc = new File(appBinHome, TORRC_ASSET_KEY);
diff --git a/src/org/torproject/android/service/TorServiceConstants.java
b/src/org/torproject/android/service/TorServiceConstants.java
index 0b22b90..9dcd972 100644
--- a/src/org/torproject/android/service/TorServiceConstants.java
+++ b/src/org/torproject/android/service/TorServiceConstants.java
@@ -83,7 +83,7 @@ public interface TorServiceConstants {
public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED =
BINARY_PRIVOXY_VERSION_INSTALLED;
//obfsproxy
-public static final String OBFSPROXY_ASSET_KEY = obfsproxy;
+public static final String OBFSCLIENT_ASSET_KEY = obfsclient;
public static final int MESSAGE_TRAFFIC_COUNT = 5;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] add new binaries and configs for polipo and others
commit 0178d3e4de35307ab130186e0803074994677cab Author: Nathan Freitas nat...@freitas.net Date: Thu Apr 24 23:44:29 2014 -0400 add new binaries and configs for polipo and others --- res/raw/obfsclient.mp3 | Bin 3318009 - 3318009 bytes res/raw/polipo.mp3 | Bin 0 - 312051 bytes res/raw/privoxy.mp3| Bin 306370 - 0 bytes res/raw/privoxy_config | 27 res/raw/tor.mp3| Bin 1815448 - 1815448 bytes res/raw/torpolipo.conf | 161 6 files changed, 161 insertions(+), 27 deletions(-) diff --git a/res/raw/obfsclient.mp3 b/res/raw/obfsclient.mp3 index fab36e2..da065cb 100644 Binary files a/res/raw/obfsclient.mp3 and b/res/raw/obfsclient.mp3 differ diff --git a/res/raw/polipo.mp3 b/res/raw/polipo.mp3 new file mode 100644 index 000..69fdf9f Binary files /dev/null and b/res/raw/polipo.mp3 differ diff --git a/res/raw/privoxy.mp3 b/res/raw/privoxy.mp3 deleted file mode 100644 index 2459aac..000 Binary files a/res/raw/privoxy.mp3 and /dev/null differ diff --git a/res/raw/privoxy_config b/res/raw/privoxy_config deleted file mode 100755 index 525b58a..000 --- a/res/raw/privoxy_config +++ /dev/null @@ -1,27 +0,0 @@ -# Generally, this file goes in /etc/privoxy/config -# -# Tor listens as a SOCKS4a proxy here: -forward-socks4a / 127.0.0.1:9050 . -confdir /data/data/org.torproject.android -logdir /data/data/org.torproject.android -# actionsfile standard # Internal purpose, recommended -#actionsfile default.action # Main actions file -#actionsfile user.action # User customizations -#filterfile default.filter - -# Don't log interesting things, only startup messages, warnings and errors -#logfile logfile -#jarfile jarfile -#debug 1 -#debug 0# show each GET/POST/CONNECT request -#debug 4096 # Startup banner and warnings -#debug 8192 # Errors - *we highly recommended enabling this* - -#user-manual /usr/share/doc/privoxy/user-manual -listen-address 127.0.0.1:8118 -toggle 1 -accept-intercepted-requests 1 -enable-remote-toggle 0 -enable-edit-actions 0 -enable-remote-http-toggle 0 -buffer-limit 4096 \ No newline at end of file diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 index 62adbdc..56bd825 100644 Binary files a/res/raw/tor.mp3 and b/res/raw/tor.mp3 differ diff --git a/res/raw/torpolipo.conf b/res/raw/torpolipo.conf new file mode 100644 index 000..32850f6 --- /dev/null +++ b/res/raw/torpolipo.conf @@ -0,0 +1,161 @@ +### Basic configuration +### *** + +# Uncomment one of these if you want to allow remote clients to +# connect: + +# proxyAddress = ::0# both IPv4 and IPv6 +# proxyAddress = 0.0.0.0# IPv4 only + +proxyAddress = 127.0.0.1 +proxyPort = 8118 + +# If you do that, you'll want to restrict the set of hosts allowed to +# connect: + +# allowedClients = 127.0.0.1, 134.157.168.57 +# allowedClients = 127.0.0.1, 134.157.168.0/24 + +allowedClients = 127.0.0.1 +allowedPorts = 1-65535 + +# Uncomment this if you want your Polipo to identify itself by +# something else than the host name: + +proxyName = localhost + +# Uncomment this if there's only one user using this instance of Polipo: + +cacheIsShared = false + +# Uncomment this if you want to use a parent proxy: + +# parentProxy = squid.example.org:3128 + +# Uncomment this if you want to use a parent SOCKS proxy: + +socksParentProxy = localhost:9050 +socksProxyType = socks5 + + +### Memory +### ** + +# Uncomment this if you want Polipo to use a ridiculously small amount +# of memory (a hundred C-64 worth or so): + +# chunkHighMark = 819200 +# objectHighMark = 128 + +# Uncomment this if you've got plenty of memory: + +# chunkHighMark = 50331648 +# objectHighMark = 16384 + +chunkHighMark = 67108864 + +### On-disk data +### + +# Uncomment this if you want to disable the on-disk cache: + +diskCacheRoot = + +# Uncomment this if you want to put the on-disk cache in a +# non-standard location: + +# diskCacheRoot = ~/.polipo-cache/ + +# Uncomment this if you want to disable the local web server: + +localDocumentRoot = + +# Uncomment this if you want to enable the pages under /polipo/index? +# and /polipo/servers?. This is a serious privacy leak if your proxy +# is shared. + +# disableIndexing = false +# disableServersList = false + +disableLocalInterface = true +disableConfiguration = true + +### Domain Name System +### ** + +# Uncomment this if you want to contact IPv4 hosts only (and make DNS +# queries somewhat faster): +# +# dnsQueryIPv6 = no + +# Uncomment this if you want Polipo to prefer IPv4 to IPv6 for +# double-stack hosts: +# +# dnsQueryIPv6 = reluctantly + +# Uncomment this to disable Polipo's DNS resolver and use the system's +# default resolver instead. If you do that, Polipo will freeze during +# every DNS query: + +dnsUseGethostbyname = yes + + +### HTTP +### + +# Uncomment this if you want to enable detection of proxy loops. +# This will cause your hostname (or whatever you put into
[tor-commits] [orbot/master] fix settings handling and add more debug output
commit d3865c0e7824a6d9360c6abb58d6215d02100b19
Author: Nathan Freitas nat...@freitas.net
Date: Fri Apr 25 12:43:30 2014 -0400
fix settings handling and add more debug output
also make SOCKS a runtime config
---
src/org/torproject/android/Orbot.java | 33 -
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/org/torproject/android/Orbot.java
b/src/org/torproject/android/Orbot.java
index 2fa5f01..4524857 100644
--- a/src/org/torproject/android/Orbot.java
+++ b/src/org/torproject/android/Orbot.java
@@ -3,12 +3,15 @@
package org.torproject.android;
+import static org.torproject.android.TorConstants.TAG;
+
import java.util.Locale;
import org.torproject.android.service.ITorService;
import org.torproject.android.service.ITorServiceCallback;
import org.torproject.android.service.TorService;
import org.torproject.android.service.TorServiceConstants;
+import org.torproject.android.service.TorServiceUtils;
import org.torproject.android.settings.SettingsPreferences;
import org.torproject.android.wizard.ChooseLocaleWizardActivity;
import org.torproject.android.wizard.TipsAndTricks;
@@ -84,14 +87,11 @@ public class Orbot extends ActionBarActivity implements
TorConstants, OnLongClic
private boolean autoStartFromIntent = false;
- SharedPreferences mPrefs;
-
/** Called when the activity is first created. */
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-mPrefs = getPrefs();
-mPrefs.registerOnSharedPreferenceChangeListener(this);
+
TorServiceUtils.getSharedPrefs(getApplicationContext()).registerOnSharedPreferenceChangeListener(this);
setLocale();
@@ -283,7 +283,7 @@ public class Orbot extends ActionBarActivity implements
TorConstants, OnLongClic
private void appConflictChecker ()
{
- boolean debug = mPrefs.getBoolean(pref_enable_logging,false);
+ boolean debug =
TorServiceUtils.getSharedPrefs(getApplicationContext()).getBoolean(pref_enable_logging,false);
if (debug)
{
@@ -383,7 +383,7 @@ public class Orbot extends ActionBarActivity implements
TorConstants, OnLongClic
}
else if (item.getItemId() == R.id.menu_diag)
{
- startActivity(new Intent(getBaseContext(),
OrbotDiagnosticsActivity.class));
+ startActivity(new Intent(getApplicationContext(),
OrbotDiagnosticsActivity.class));
}
else if (item.getItemId() == R.id.menu_about)
@@ -470,6 +470,8 @@ public class Orbot extends ActionBarActivity implements
TorConstants, OnLongClic
private void enableHiddenServicePort (int hsPort)
{
+ SharedPreferences mPrefs =
TorServiceUtils.getSharedPrefs(getApplicationContext());
+
Editor pEdit = mPrefs.edit();
String hsPortString = mPrefs.getString(pref_hs_ports, );
@@ -603,7 +605,7 @@ public class Orbot extends ActionBarActivity implements
TorConstants, OnLongClic
{
-
+ SharedPreferences mPrefs =
TorServiceUtils.getSharedPrefs(getApplicationContext());
boolean showWizard =
mPrefs.getBoolean(show_wizard,true);
if (showWizard)
@@ -616,7 +618,7 @@ public class Orbot extends ActionBarActivity implements
TorConstants, OnLongClic
startWizard();
- //startActivityForResult(new
Intent(getBaseContext(), LotsaText.class), 1);
+ //startActivityForResult(new
Intent(getApplicationContext(), LotsaText.class), 1);
}
@@ -652,6 +654,7 @@ public class Orbot extends ActionBarActivity implements
TorConstants, OnLongClic
*/
private void openBrowser(final String browserLaunchUrl)
{
+ SharedPreferences mPrefs =
TorServiceUtils.getSharedPrefs(getApplicationContext());
boolean isOrwebInstalled =
appInstalledOrNot(info.guardianproject.browser);
boolean isTransProxy = mPrefs.getBoolean(pref_transparent,
false);
@@ -741,11 +744,11 @@ public class Orbot extends ActionBarActivity implements
TorConstants, OnLongClic
private void startWizard ()
{
-
+ SharedPreferences mPrefs =
TorServiceUtils.getSharedPrefs(getApplicationContext());
Editor pEdit = mPrefs.edit();
pEdit.putBoolean(wizardscreen1,true);
pEdit.commit();
- startActivityForResult(new Intent(getBaseContext(),
ChooseLocaleWizardActivity.class), 1);
+
[tor-commits] [orbot/master] liballium/obfsclient should be sourced from tp.o repos
commit a6af8784addd142343856429b4aba80093e41710 Author: Yawning Angel yawn...@torproject.org Date: Wed Apr 9 12:35:43 2014 -0700 liballium/obfsclient should be sourced from tp.o repos Signed-off-by: Nathan Freitas nat...@freitas.net --- .gitmodules|5 - external/liballium |1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 1c98c01..927bcca 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,7 +21,10 @@ url = git://git.netfilter.org/iptables [submodule external/obfsclient] path = external/obfsclient - url = https://github.com/Yawning/obfsclient.git + url = https://git.torproject.org/user/yawning/obfsclient.git [submodule external/superuser-commands] path = external/superuser-commands url = https://github.com/dschuermann/superuser-commands.git +[submodule external/liballium] + path = external/liballium + url = https://git.torproject.org/user/yawning/liballium.git diff --git a/external/liballium b/external/liballium new file mode 16 index 000..5272de7 --- /dev/null +++ b/external/liballium @@ -0,0 +1 @@ +Subproject commit 5272de7361897ee6b5c969fd1eec6609d64ac13a ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] updated to 0.2.5.3 for scramblesuit/obfs support
commit 38700f9c9c54462e57bf54db34e62f2ab0568428 Author: Nathan Freitas nat...@freitas.net Date: Fri Apr 25 12:43:59 2014 -0400 updated to 0.2.5.3 for scramblesuit/obfs support --- external/tor |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/tor b/external/tor index 5059627..29a67e7 16 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit 505962724c05445fa0f0354e990e6cb60ef193e9 +Subproject commit 29a67e73beae804fd9b9347aabb08072c07cbe0d ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] small updates to Makefile for NDK
commit 7af85b5cc3069debfeb2928f784d13695ff01677 Author: Nathan Freitas nat...@freitas.net Date: Thu Apr 24 12:29:41 2014 -0400 small updates to Makefile for NDK --- external/Makefile | 44 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/external/Makefile b/external/Makefile index 7fec5de..aa6922c 100644 --- a/external/Makefile +++ b/external/Makefile @@ -23,16 +23,15 @@ endif # Android NDK setup NDK_BASE ?= /opt/android-ndk -NDK_PLATFORM_LEVEL ?= 5 +NDK_PLATFORM_LEVEL ?= 9 NDK_ABI=arm -NDK_COMPILER_VERSION = 4.8 +NDK_TOOLCHAIN_VERSION=4.8 NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI) APP_ABI=armeabi # NDK platform level, aka APP_PLATFORM, is equivalent to minSdkVersion APP_PLATFORM := android-$(shell sed -n 's,.*android:minSdkVersion=\([0-9][0-9]*\).*,\1,p' \ $(EXTERNAL_ROOT)/../AndroidManifest.xml) NDK_SYSROOT=$(NDK_BASE)/platforms/$(APP_PLATFORM)/arch-$(NDK_ABI) -NDK_TOOLCHAIN_VERSION=4.8 NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]') ifeq ($(NDK_ABI),x86) HOST = i686-linux-android @@ -73,7 +72,6 @@ endif libevent libevent-clean \ iptables iptables-clean \ tor tor-clean \ - obfsproxy obfsproxy-clean \ liballium liballium-clean \ obfsclient obfsclient-clean \ privoxy privoxy-clean @@ -214,42 +212,10 @@ tor-clean: #--# -# obfsproxy - - -obfsproxy/Makefile: - cp obfsproxy_android_no_hardening.patch obfsproxy - -cd obfsproxy \ - patch -N -p1 --reject-file=- obfsproxy_android_no_hardening.patch - cd obfsproxy \ - ./autogen.sh - cp config.sub obfsproxy - cp config.guess obfsproxy - cd obfsproxy \ -CC=$(CC) AR=$(AR) RANLIB=$(RANLIB) CFLAGS=$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow LDFLAGS=$(LDFLAGS) \ - libevent_LIBS=-L$(EXTERNAL_ROOT)/lib -levent libevent_CFLAGS=-I$(EXTERNAL_ROOT)/include \ - libcrypto_LIBS=-L$(EXTERNAL_ROOT)/lib -lcrypto libcrypto_CFLAGS=-I$(EXTERNAL_ROOT)/include \ -./configure \ ---host=$(HOST) \ - -obfsproxy-build-stamp: obfsproxy/Makefile - $(MAKE) -C obfsproxy - touch obfsproxy-build-stamp - -obfsproxy: openssl libevent obfsproxy-build-stamp - test -d bin || mkdir bin - cp obfsproxy/obfsproxy bin - -obfsproxy-clean: - -rm -f bin/obfsproxy - -rm -f obfsproxy-build-stamp - -cd obfsproxy \ - git clean -fdx - -#--# # liballium liballium/Makefile: + cd liballium mkdir m4 cd liballium ./autogen.sh cp config.sub liballium cp config.guess liballium @@ -372,18 +338,16 @@ jtorctl-clean: #in order to stop Android OS (older devices) from trying to compress/decompress it #this is related to a bug in compression of assets and resources 1MB -assets: tor privoxy jtorctl obfsproxy iptables obfsclient +assets: tor privoxy jtorctl iptables obfsclient install bin/jtorctl.jar ../libs install -d ../res/raw -zip ../res/raw/privoxy.mp3 bin/privoxy - -zip ../res/raw/obfsproxy.mp3 bin/obfsproxy -zip ../res/raw/obfsclient.mp3 bin/obfsclient -zip ../res/raw/tor.mp3 bin/tor -zip ../res/raw/xtables.mp3 bin/xtables assets-clean: -rm ../res/raw/privoxy.mp3 - -rm ../res/raw/obfsproxy.mp3 -rm ../res/raw/obfsclient.mp3 -rm ../res/raw/tor.mp3 -rm ../res/raw/xtables.mp3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] Update the obfsclient submodule to include Android fixes
commit 43c259a906dae95606eaa9f3efeffd0fddb0 Author: Yawning Angel yawn...@torproject.org Date: Wed Apr 9 14:16:25 2014 -0700 Update the obfsclient submodule to include Android fixes Signed-off-by: Nathan Freitas nat...@freitas.net --- external/obfsclient |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/obfsclient b/external/obfsclient index 1f5f2a3..81d8c2d 16 --- a/external/obfsclient +++ b/external/obfsclient @@ -1 +1 @@ -Subproject commit 1f5f2a358e9cce67184a250553b82e48f1cbd82e +Subproject commit 81d8c2da9864bafc249aa4a058426ef982a61ac3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] fix variable name to obfsclient
commit a4d8669cc206ad13910d82b6d85211dab75ffa32
Author: Nathan Freitas nat...@freitas.net
Date: Thu Apr 24 12:35:52 2014 -0400
fix variable name to obfsclient
---
src/org/torproject/android/service/TorService.java | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/org/torproject/android/service/TorService.java
b/src/org/torproject/android/service/TorService.java
index 3825fa4..3bb0bc6 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -86,7 +86,7 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
private File fileTor;
private File filePrivoxy;
-private File fileObfsProxy;
+private File fileObfsclient;
private File fileXtables;
private File fileTorRc;
@@ -494,10 +494,10 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
shell.add(killCommand);
}
- while ((procId =
TorServiceUtils.findProcessId(fileObfsProxy.getAbsolutePath())) != -1)
+ while ((procId =
TorServiceUtils.findProcessId(fileObfsclient.getAbsolutePath())) != -1)
{
- logNotice(Found ObfsProxy PID= + procId + - killing
now...);
+ logNotice(Found fileObfsclient PID= + procId + -
killing now...);
SimpleCommand killCommand = new SimpleCommand(toolbox
kill + procId);
shell.add(killCommand);
@@ -532,7 +532,7 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
filePrivoxy = new File(appBinHome, PRIVOXY_ASSET_KEY);
- fileObfsProxy = new File(appBinHome, OBFSCLIENT_ASSET_KEY);
+ fileObfsclient = new File(appBinHome, OBFSCLIENT_ASSET_KEY);
fileTorRc = new File(appBinHome, TORRC_ASSET_KEY);
@@ -626,7 +626,7 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
enableBinExec(fileTor);
enableBinExec(filePrivoxy);
- enableBinExec(fileObfsProxy);
+ enableBinExec(fileObfsclient);
enableBinExec(fileXtables);
updateSettings ();
@@ -1726,7 +1726,7 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
if (obfsBridges)
{
-
mBinder.updateConfiguration(ClientTransportPlugin,obfs2 exec +
fileObfsProxy.getAbsolutePath() + --managed, false);
+
mBinder.updateConfiguration(ClientTransportPlugin,obfsclient exec +
fileObfsclient.getAbsolutePath() + --managed, false);
}
mBinder.updateConfiguration(UpdateBridgesFromAuthority, 0, false);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] remove obfsproxy, update obfsclient
commit 4d3754bbb237ce53e27a4b181205737ea0f3a0b4 Author: Nathan Freitas nat...@freitas.net Date: Thu Apr 24 12:29:49 2014 -0400 remove obfsproxy, update obfsclient --- external/obfsclient |2 +- external/obfsproxy|1 - external/obfsproxy_android_no_hardening.patch | 19 --- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/external/obfsclient b/external/obfsclient index 81d8c2d..c91f7bb 16 --- a/external/obfsclient +++ b/external/obfsclient @@ -1 +1 @@ -Subproject commit 81d8c2da9864bafc249aa4a058426ef982a61ac3 +Subproject commit c91f7bbf3e0eedb080319ba3cfed7b47597b5aeb diff --git a/external/obfsproxy b/external/obfsproxy deleted file mode 16 index 94ebc4c..000 --- a/external/obfsproxy +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 94ebc4c3edf1e3e5f313444e59981ac557578df5 diff --git a/external/obfsproxy_android_no_hardening.patch b/external/obfsproxy_android_no_hardening.patch deleted file mode 100644 index 58425be..000 --- a/external/obfsproxy_android_no_hardening.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit d42eec7683ce9d47fc846e511e815ec1b2950c27 -Author: n8fr8 nat...@freitas.net -Date: Fri May 4 17:32:51 2012 -0400 - -remove hardening for android - -diff --git a/configure.ac b/configure.ac -index facd3c6..ad405ea 100644 a/configure.ac -+++ b/configure.ac -@@ -24,7 +24,7 @@ AC_CHECK_HEADERS([sys/types.h]) - AC_CHECK_HEADERS([netinet/in.h]) - - ### Compiler Hardening ### --AX_ENABLE_HARDENING -+##AX_ENABLE_HARDENING - - ### Libraries ### - ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] update jtorctrl jar
commit 000cf579b97c3339247a4568d47e69a4f9c07631 Author: Nathan Freitas nat...@freitas.net Date: Thu Apr 24 12:30:31 2014 -0400 update jtorctrl jar --- libs/jtorctl.jar | Bin 14742 - 14742 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/jtorctl.jar b/libs/jtorctl.jar index cf83fcb..a2fc58f 100755 Binary files a/libs/jtorctl.jar and b/libs/jtorctl.jar differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] update binaries
commit d003826c98bfd6f83d8cf2074b42ea11727a89a0 Author: Nathan Freitas nat...@freitas.net Date: Thu Apr 24 12:30:08 2014 -0400 update binaries --- res/raw/obfsclient.mp3 | Bin 0 - 3318009 bytes res/raw/obfsproxy.mp3 | Bin 352804 - 0 bytes res/raw/privoxy.mp3| Bin 264879 - 306370 bytes res/raw/tor.mp3| Bin 1781999 - 1815448 bytes res/raw/xtables.mp3| Bin 166343 - 166343 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/obfsclient.mp3 b/res/raw/obfsclient.mp3 new file mode 100644 index 000..fab36e2 Binary files /dev/null and b/res/raw/obfsclient.mp3 differ diff --git a/res/raw/obfsproxy.mp3 b/res/raw/obfsproxy.mp3 deleted file mode 100644 index 30b1993..000 Binary files a/res/raw/obfsproxy.mp3 and /dev/null differ diff --git a/res/raw/privoxy.mp3 b/res/raw/privoxy.mp3 index 54e5799..2459aac 100644 Binary files a/res/raw/privoxy.mp3 and b/res/raw/privoxy.mp3 differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 index 3642c7e..62adbdc 100644 Binary files a/res/raw/tor.mp3 and b/res/raw/tor.mp3 differ diff --git a/res/raw/xtables.mp3 b/res/raw/xtables.mp3 index 292daf5..4bd634b 100644 Binary files a/res/raw/xtables.mp3 and b/res/raw/xtables.mp3 differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] remove debug waiter
commit b056e7f6cdf26ffb0a13d4b34d129a74d4949315
Author: Nathan Freitas nat...@freitas.net
Date: Thu May 1 21:37:36 2014 -0400
remove debug waiter
---
src/org/torproject/android/service/TorService.java |2 --
1 file changed, 2 deletions(-)
diff --git a/src/org/torproject/android/service/TorService.java
b/src/org/torproject/android/service/TorService.java
index 05f4376..21c6247 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -274,8 +274,6 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
* @see android.app.Service#onStart(android.content.Intent, int)
*/
public int onStartCommand(Intent intent, int flags, int startId) {
-
- android.os.Debug.waitForDebugger();
try
{
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] update manifest for v14-alpha-1
commit 2b6ff4e64cae4bdcec0c4aa5feeffddb5ee8fc03 Author: Nathan Freitas nat...@freitas.net Date: Fri Apr 25 12:45:34 2014 -0400 update manifest for v14-alpha-1 --- AndroidManifest.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index deaad72..779b1cd 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.torproject.android - android:versionName=13.0.7 - android:versionCode=86 + android:versionName=14.0.0-ALPHA-1 + android:versionCode=87 android:installLocation=auto ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] add binary stripping to makefile
commit 05b6553cba52cb7721005af087ec2a8b33ee88b8 Author: Nathan Freitas nat...@freitas.net Date: Fri Apr 25 12:45:11 2014 -0400 add binary stripping to makefile --- external/Makefile |5 + 1 file changed, 5 insertions(+) diff --git a/external/Makefile b/external/Makefile index 899bb2f..96b75ed 100644 --- a/external/Makefile +++ b/external/Makefile @@ -58,6 +58,7 @@ STRIP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip \ CFLAGS = -DANDROID $(TARGET_CFLAGS) LDFLAGS = -llog $(TARGET_LDFLAGS) + # change 'release' to 'debug' for unoptimized debug builds ifeq ($(APP_ABI),armeabi-v7a) CFLAGS += $(TARGET_arm_release_CFLAGS) @@ -324,9 +325,13 @@ jtorctl-clean: assets: tor polipo jtorctl iptables obfsclient install bin/jtorctl.jar ../libs install -d ../res/raw + -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/polipo -zip ../res/raw/polipo.mp3 bin/polipo + -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/obfsclient -zip ../res/raw/obfsclient.mp3 bin/obfsclient + -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/tor -zip ../res/raw/tor.mp3 bin/tor + -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/xtables -zip ../res/raw/xtables.mp3 bin/xtables assets-clean: ___ 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 we start/stop Tor, Polipo
commit cbbc5e45e18bef6ad40d1a61bf31a4917110c0f7
Author: Nathan Freitas nat...@freitas.net
Date: Thu May 1 21:36:03 2014 -0400
improve how we start/stop Tor, Polipo
to find process id, do ps of all, then filter (most compat)
use async service for Tor start/stop instead of threads
---
src/org/torproject/android/service/TorService.java | 140 +---
.../android/service/TorServiceConstants.java |2 +-
.../android/service/TorServiceUtils.java |6 +-
3 files changed, 67 insertions(+), 81 deletions(-)
diff --git a/src/org/torproject/android/service/TorService.java
b/src/org/torproject/android/service/TorService.java
index 4f897e9..05f4376 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -15,8 +15,6 @@ import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
import java.net.Socket;
import java.util.ArrayList;
import java.util.Arrays;
@@ -29,7 +27,6 @@ import net.freehaven.tor.control.EventHandler;
import net.freehaven.tor.control.TorControlConnection;
import org.sufficientlysecure.rootcommands.Shell;
-import org.sufficientlysecure.rootcommands.Toolbox;
import org.sufficientlysecure.rootcommands.command.SimpleCommand;
import org.torproject.android.Orbot;
import org.torproject.android.R;
@@ -50,15 +47,16 @@ import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.graphics.Color;
import android.net.ConnectivityManager;
-import android.os.Build;
+import android.os.AsyncTask;
import android.os.IBinder;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationCompat.Builder;
import android.util.Log;
+import android.widget.TextView;
-public class TorService extends Service implements TorServiceConstants,
TorConstants, Runnable, EventHandler
+public class TorService extends Service implements TorServiceConstants,
TorConstants, EventHandler
{
public static boolean ENABLE_DEBUG_LOG = false;
@@ -136,7 +134,6 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
{
try
{
-
int procId = initControlConnection(1);
@@ -278,6 +275,7 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
*/
public int onStartCommand(Intent intent, int flags, int startId) {
+ android.os.Debug.waitForDebugger();
try
{
@@ -321,34 +319,6 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
-
- public void run ()
- {
-
- if (currentStatus == STATUS_CONNECTING)
- {
-
-try
-{
- initTor();
-}
-catch (Exception e)
-{
-
- logException(Unable to start Tor: + e.toString(),e);
-currentStatus = STATUS_OFF;
-
this.showToolbarNotification(getString(R.string.unable_to_start_tor) + : +
e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1, false);
-}
-
- }
- else if (currentStatus == STATUS_OFF)
- {
-
- stopTor();
-
- }
- }
-
public void onDestroy ()
{
@@ -634,33 +604,7 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
//checkAddressAndCountry();
}
-
-/**
-private boolean checkPortsAvailable ()
-{
- int[] ports = {9050,9051,8118};
-
- for (int port: ports)
- {
- try
- {
- logNotice(checking local port is available: + port);
-
- ServerSocket ss = new ServerSocket();
- ss.bind(new InetSocketAddress(IP_LOCALHOST,port));
- ss.close();
- }
- catch (Exception e)
- {
- logException (Tor socket + port + is not
available,e);
- return false;
- }
- }
-
- return true;
-
-}
-*/
+
/*
* activate means whether to apply the users preferences
@@ -773,7 +717,6 @@ public class TorService extends Service implements
[tor-commits] [orbot/master] updated icons with dark background
commit b31c11f3cb2c27c826c102e0203eb7d95415ea34 Author: Nathan Freitas nat...@freitas.net Date: Thu May 1 16:15:25 2014 -0400 updated icons with dark background --- res/drawable-hdpi/ic_launcher.png| Bin 6094 - 7854 bytes res/drawable-mdpi/ic_launcher.png| Bin 3102 - 3993 bytes res/drawable-xhdpi/ic_launcher.png | Bin 9158 - 12380 bytes res/drawable-xxhdpi/ic_launcher.png | Bin 18172 - 24708 bytes res/drawable-xxxhdpi/ic_launcher.png | Bin 28466 - 40755 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png index fce00b3..e4887e7 100644 Binary files a/res/drawable-hdpi/ic_launcher.png and b/res/drawable-hdpi/ic_launcher.png differ diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png index 1a439a3..2ed1f96 100644 Binary files a/res/drawable-mdpi/ic_launcher.png and b/res/drawable-mdpi/ic_launcher.png differ diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png index 0bb0317..d2aac93 100644 Binary files a/res/drawable-xhdpi/ic_launcher.png and b/res/drawable-xhdpi/ic_launcher.png differ diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/drawable-xxhdpi/ic_launcher.png index 2c37faf..6182ce4 100644 Binary files a/res/drawable-xxhdpi/ic_launcher.png and b/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/res/drawable-xxxhdpi/ic_launcher.png b/res/drawable-xxxhdpi/ic_launcher.png index 7512663..501cd32 100644 Binary files a/res/drawable-xxxhdpi/ic_launcher.png and b/res/drawable-xxxhdpi/ic_launcher.png differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] ensure setConft on control port works consistently
commit b9f14b318b581f10de867d1533bacf0678d7fe55
Author: Nathan Freitas nat...@freitas.net
Date: Fri May 2 00:39:37 2014 -0400
ensure setConft on control port works consistently
---
src/org/torproject/android/service/TorService.java | 65 ++--
1 file changed, 47 insertions(+), 18 deletions(-)
diff --git a/src/org/torproject/android/service/TorService.java
b/src/org/torproject/android/service/TorService.java
index 21c6247..5075116 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -18,6 +18,7 @@ import java.io.PrintWriter;
import java.net.Socket;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.LinkedHashMap;
import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
@@ -75,8 +76,8 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
private static final int MAX_START_TRIES = 3;
-private ArrayListString configBuffer = null;
-private ArrayListString resetBuffer = null;
+private LinkedHashMapString,String configBuffer = null;
+private LinkedHashMapString,String resetBuffer = null;
// private String appHome;
private File appBinHome;
@@ -144,7 +145,11 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
processSettingsImpl();
- currentStatus = STATUS_ON;
+ String state = conn.getInfo(dormant);
+ if (state != null
Integer.parseInt(state) == 0)
+ currentStatus = STATUS_ON;
+ else
+ currentStatus =
STATUS_CONNECTING;
return true;
}
@@ -1188,7 +1193,24 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
logNotice(sb.toString());
}
+
+ /**
+ if (currentStatus != STATUS_ON)
+ {
+ try {
+ String state;
+
+ state = conn.getInfo(dormant);
+ if (state != null Integer.parseInt(state) ==
0)
+ currentStatus = STATUS_ON;
+ else
+ currentStatus = STATUS_CONNECTING;
+
+ } catch (IOException e) {
+ logException(Error getting state from Tor
control port,e);
+ }
+ }*/
}
@@ -1349,19 +1371,19 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
public boolean updateConfiguration (String name, String value, boolean
saveToDisk)
{
if (configBuffer == null)
- configBuffer = new ArrayListString();
+ configBuffer = new LinkedHashMapString,String();
if (resetBuffer == null)
- resetBuffer = new ArrayListString();
+ resetBuffer = new LinkedHashMapString,String();
if (value == null || value.length() == 0)
{
- resetBuffer.add(name);
+ resetBuffer.put(name,);
}
else
{
- configBuffer.add(name + ' ' + value);
+ configBuffer.put(name,value);
}
return false;
@@ -1398,14 +1420,24 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
if (resetBuffer != null resetBuffer.size()
0)
{
- conn.resetConf(resetBuffer);
+
conn.resetConf(resetBuffer.keySet());
resetBuffer = null;
}
if (configBuffer != null
configBuffer.size() 0)
{
- conn.setConf(configBuffer);
+ for (String key :
[tor-commits] [orbot/master] add log max size feature
commit 0dc50cc4927180d078a60a0ff40e6c3e23991ba0
Author: Nathan Freitas nat...@freitas.net
Date: Fri May 2 00:39:59 2014 -0400
add log max size feature
---
src/org/torproject/android/Orbot.java|4
src/org/torproject/android/TorConstants.java |3 +++
2 files changed, 7 insertions(+)
diff --git a/src/org/torproject/android/Orbot.java
b/src/org/torproject/android/Orbot.java
index 4524857..21f304d 100644
--- a/src/org/torproject/android/Orbot.java
+++ b/src/org/torproject/android/Orbot.java
@@ -178,6 +178,10 @@ public class Orbot extends ActionBarActivity implements
TorConstants, OnLongClic
private void appendLogTextAndScroll(String text)
{
if(mTxtOrbotLog != null){
+
+ if (mTxtOrbotLog.getText().length() MAX_LOG_LENGTH)
+ mTxtOrbotLog.setText();
+
mTxtOrbotLog.append(text + \n);
final Layout layout = mTxtOrbotLog.getLayout();
if(layout != null){
diff --git a/src/org/torproject/android/TorConstants.java
b/src/org/torproject/android/TorConstants.java
index 834f20d..36cdf48 100644
--- a/src/org/torproject/android/TorConstants.java
+++ b/src/org/torproject/android/TorConstants.java
@@ -53,4 +53,7 @@ public interface TorConstants {
public final static String PREF_DISABLE_NETWORK =
pref_disable_network;
public final static String PREF_TOR_SHARED_PREFS =
org.torproject.android_preferences;
+
+ public final static int MAX_LOG_LENGTH = 1;
+
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] updated changelog for v14
commit 648b10c235cca5960ef22844e1bb6214e14459e4 Author: Nathan Freitas nat...@freitas.net Date: Fri May 2 01:18:22 2014 -0400 updated changelog for v14 --- CHANGELOG | 29 + 1 file changed, 29 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 81f0ab6..ca363a7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,34 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +14.0.0 (ALPHA-2) +ea919c5 add the basic proguard support +147b57a remove unused preference +0dc50cc add log max size feature +b9f14b3 ensure setConft on control port works consistently +b056e7f remove debug waiter +b2d4bb3 updated to v14-alpha-2 +cbbc5e4 improve how we start/stop Tor, Polipo to find process id, do ps of all, then filter (most compat) use async service for Tor st +b31c11f updated icons with dark background +2b6ff4e update manifest for v14-alpha-1 +05b6553 add binary stripping to makefile +21c1cad update binaries and torrc for obfs/PT work +144460b fixes for preference handling in multi process context +38700f9 updated to 0.2.5.3 for scramblesuit/obfs support +d3865c0 fix settings handling and add more debug output also make SOCKS a runtime config +d529334 clean up wizard context use +0178d3e add new binaries and configs for polipo and others +40546c9 change from privoxy to polipo for http proxy +a4d8669 fix variable name to obfsclient +2f7a9dd update to new obfsclient repo +000cf57 update jtorctrl jar +f485015 install obfsclient binary +d003826 update binaries +4d3754b remove obfsproxy, update obfsclient +7af85b5 small updates to Makefile for NDK +2c2d094 Integrate obfsclient/liballium into the build process +43c259a Update the obfsclient submodule to include Android fixes +a6af878 liballium/obfsclient should be sourced from tp.o repos + 13.0.6 89fc2e6 updated to 13.0.6-RC-3 b9eeb37 ensure Service has foreground priority so it is not killed (and improve onBind() calls to reset state if it is killed) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] fixes for preference handling in multi process context
commit 144460beed66ee595f37cbbc87b2245420dad128
Author: Nathan Freitas nat...@freitas.net
Date: Fri Apr 25 12:44:21 2014 -0400
fixes for preference handling in multi process context
---
src/org/torproject/android/OnBootReceiver.java |6 +-
src/org/torproject/android/OrbotApp.java |4 +-
src/org/torproject/android/service/TorService.java | 115
.../android/service/TorServiceConstants.java |4 +-
.../android/service/TorServiceUtils.java | 15 +++
.../torproject/android/service/TorTransProxy.java |4 +-
.../torproject/android/settings/AppManager.java|5 +-
.../android/settings/SettingsPreferences.java | 21 +++-
8 files changed, 115 insertions(+), 59 deletions(-)
diff --git a/src/org/torproject/android/OnBootReceiver.java
b/src/org/torproject/android/OnBootReceiver.java
index a5ca1d6..92104e0 100644
--- a/src/org/torproject/android/OnBootReceiver.java
+++ b/src/org/torproject/android/OnBootReceiver.java
@@ -1,12 +1,12 @@
package org.torproject.android;
import org.torproject.android.service.TorService;
+import org.torproject.android.service.TorServiceUtils;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
public class OnBootReceiver extends BroadcastReceiver {
@@ -16,7 +16,8 @@ public class OnBootReceiver extends BroadcastReceiver {
if (intent.getAction() != null
intent.getAction().equals(android.intent.action.BOOT_COMPLETED))
{
- SharedPreferences prefs =
TorService.getSharedPrefs(context.getApplicationContext());
+
+ SharedPreferences prefs =
TorServiceUtils.getSharedPrefs(context.getApplicationContext());
boolean startOnBoot =
prefs.getBoolean(pref_start_boot,false);
@@ -34,5 +35,6 @@ public class OnBootReceiver extends BroadcastReceiver {
}
+
}
diff --git a/src/org/torproject/android/OrbotApp.java
b/src/org/torproject/android/OrbotApp.java
index d470afb..cb1824c 100644
--- a/src/org/torproject/android/OrbotApp.java
+++ b/src/org/torproject/android/OrbotApp.java
@@ -2,6 +2,8 @@ package org.torproject.android;
import java.util.Locale;
+import org.torproject.android.service.TorServiceUtils;
+
import android.app.Application;
import android.content.SharedPreferences;
import android.content.res.Configuration;
@@ -18,7 +20,7 @@ public class OrbotApp extends Application implements
TorConstants
public void onCreate() {
super.onCreate();
-settings = PreferenceManager.getDefaultSharedPreferences(this);
+settings = TorServiceUtils.getSharedPrefs(getApplicationContext());
Configuration config = getResources().getConfiguration();
diff --git a/src/org/torproject/android/service/TorService.java
b/src/org/torproject/android/service/TorService.java
index 5264370..4f897e9 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -292,7 +292,7 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
if (intent != null intent.getAction()!=null
intent.getAction().equals(onboot))
{
- boolean startOnBoot =
getSharedPrefs(getApplicationContext()).getBoolean(pref_start_boot,false);
+ boolean startOnBoot =
TorServiceUtils.getSharedPrefs(getApplicationContext()).getBoolean(pref_start_boot,false);
if (startOnBoot)
{
@@ -308,7 +308,7 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
// We want this service to continue running until it is
explicitly
// stopped, so return sticky.
- return START_STICKY;
+ return START_NOT_STICKY;
}
catch (Exception e)
@@ -319,14 +319,7 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
}
- public static SharedPreferences getSharedPrefs (Context context)
- {
- if (Build.VERSION.SDK_INT=11)
- return
context.getSharedPreferences(TorConstants.PREF_TOR_SHARED_PREFS,Context.MODE_MULTI_PROCESS);
- else
- return
context.getSharedPreferences(TorConstants.PREF_TOR_SHARED_PREFS,Context.MODE_PRIVATE);
-
- }
+
public void run ()
@@ -341,11 +334,10 @@ public class TorService extends
[tor-commits] [orbot/master] add the basic proguard support
commit ea919c55b7fe5cc20dbb8d4cef65867cd236bf7c
Author: Nathan Freitas nat...@freitas.net
Date: Fri May 2 00:40:57 2014 -0400
add the basic proguard support
---
project.properties |1 +
1 file changed, 1 insertion(+)
diff --git a/project.properties b/project.properties
index cf33a83..ea84c57 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-project.txt
# Project target.
target=android-19
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] update binaries and torrc for obfs/PT work
commit 21c1cadccab8076481260e072b676ca870cadeb1 Author: Nathan Freitas nat...@freitas.net Date: Fri Apr 25 12:44:37 2014 -0400 update binaries and torrc for obfs/PT work --- res/raw/obfsclient.mp3 | Bin 3318009 - 807052 bytes res/raw/polipo.mp3 | Bin 312051 - 123224 bytes res/raw/tor.mp3| Bin 1815448 - 1708250 bytes res/raw/torrc |5 - res/raw/xtables.mp3| Bin 166343 - 152674 bytes 5 files changed, 5 deletions(-) diff --git a/res/raw/obfsclient.mp3 b/res/raw/obfsclient.mp3 index da065cb..1782cde 100644 Binary files a/res/raw/obfsclient.mp3 and b/res/raw/obfsclient.mp3 differ diff --git a/res/raw/polipo.mp3 b/res/raw/polipo.mp3 index 69fdf9f..6f0fc28 100644 Binary files a/res/raw/polipo.mp3 and b/res/raw/polipo.mp3 differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 index 56bd825..dc4266e 100644 Binary files a/res/raw/tor.mp3 and b/res/raw/tor.mp3 differ diff --git a/res/raw/torrc b/res/raw/torrc index 85d6b86..e68d169 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -1,8 +1,3 @@ -SocksPort 9050 -SOCKSListenAddress 127.0.0.1 -SafeSocks 0 -TestSocks 1 -WarnUnsafeSocks 1 Log notice stdout ControlListenAddress 127.0.0.1 ControlPort 9051 diff --git a/res/raw/xtables.mp3 b/res/raw/xtables.mp3 index 4bd634b..caab569 100644 Binary files a/res/raw/xtables.mp3 and b/res/raw/xtables.mp3 differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] updated to v14-alpha-2
commit b2d4bb350777d820db74c82fcbe53b8e7620e445 Author: Nathan Freitas nat...@freitas.net Date: Thu May 1 21:37:01 2014 -0400 updated to v14-alpha-2 --- AndroidManifest.xml |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 779b1cd..9b4bee9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,9 +1,10 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.torproject.android - android:versionName=14.0.0-ALPHA-1 - android:versionCode=87 + android:versionName=14.0.0-ALPHA-2 + android:versionCode=89 android:installLocation=auto + uses-sdk android:minSdkVersion=9 android:targetSdkVersion=19/ @@ -21,6 +22,7 @@ android:theme=@style/Theme.AppCompat android:allowBackup=false android:allowClearUserData=true +android:largeHeap=true activity android:name=.Orbot android:configChanges=orientation|screenSize ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] improvement for network state checking code
commit b8140191efc3130ae9d03499e903b78c43d62a7f
Author: Nathan Freitas nat...@freitas.net
Date: Fri May 2 10:10:09 2014 -0400
improvement for network state checking code
---
src/org/torproject/android/service/TorService.java | 25
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/org/torproject/android/service/TorService.java
b/src/org/torproject/android/service/TorService.java
index 5075116..97e2851 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -18,8 +18,8 @@ import java.io.PrintWriter;
import java.net.Socket;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.LinkedHashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.StringTokenizer;
@@ -48,6 +48,7 @@ import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.graphics.Color;
import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
import android.os.AsyncTask;
import android.os.IBinder;
import android.os.RemoteCallbackList;
@@ -55,7 +56,6 @@ import android.os.RemoteException;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationCompat.Builder;
import android.util.Log;
-import android.widget.TextView;
public class TorService extends Service implements TorServiceConstants,
TorConstants, EventHandler
{
@@ -1580,12 +1580,22 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
SharedPreferences prefs =
TorServiceUtils.getSharedPrefs(getApplicationContext());
- mConnectivity =
!intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false);
-
boolean doNetworKSleep =
prefs.getBoolean(TorConstants.PREF_DISABLE_NETWORK, true);
if (doNetworKSleep mBinder != null)
{
+ final ConnectivityManager cm = (ConnectivityManager)
getSystemService(Context.CONNECTIVITY_SERVICE);
+ final NetworkInfo netInfo = cm.getActiveNetworkInfo();
+
+ if(netInfo != null netInfo.isConnected()) {
+ // WE ARE CONNECTED: DO SOMETHING
+ mConnectivity = true;
+ }
+ else {
+ // WE ARE NOT: DO SOMETHING ELSE
+ mConnectivity = false;
+ }
+
try {
mBinder.updateConfiguration(DisableNetwork, mConnectivity ? 0 : 1, false);
mBinder.saveConfiguration();
@@ -1870,7 +1880,12 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
mBinder.updateConfiguration(TestSocks, 1, false);
mBinder.updateConfiguration(WarnUnsafeSocks, 1, false);
-
+}
+
+private void blockPlaintextPorts (String portList) throws RemoteException
+{
+
+ mBinder.updateConfiguration(RejectPlaintextPorts,portList,false);
}
//using Google DNS for now as the public DNS server
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] remove unused preference
commit 147b57af4293b189f1b00b23a8b9e0877f315a4a Author: Nathan Freitas nat...@freitas.net Date: Fri May 2 00:40:19 2014 -0400 remove unused preference --- res/xml/preferences.xml |5 - 1 file changed, 5 deletions(-) diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 5c310c4..095a5d0 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -105,11 +105,6 @@ android:summary=@string/use_only_these_specified_nodes/ android:title=@string/use_bridges android:key=pref_bridges_enabled android:summary=@string/enable_alternate_entrance_nodes_into_the_tor_network/ -CheckBoxPreference android:key=pref_bridges_obfuscated - android:defaultValue=false -android:title=@string/bridges_obfuscated -android:summary=@string/enable_if_configured_bridges_are_obfuscated_bridges/ - EditTextPreference android:key=pref_bridges_list android:title=@string/bridges android:summary=@string/ip_address_and_port_of_bridges ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] Integrate obfsclient/liballium into the build process
commit 2c2d09460194249b57adb5df55efba2e67da9bce Author: Yawning Angel yawn...@torproject.org Date: Wed Apr 9 16:23:52 2014 -0700 Integrate obfsclient/liballium into the build process * Compiler/toolchain version changed to 4.8 for C++11 * Build and package obfsclient/liballium NB: Currently obfsclient is build with debugging information which results in a binary that is rather large, strongly consider stripping. Signed-off-by: Nathan Freitas nat...@freitas.net --- external/Makefile | 59 + 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/external/Makefile b/external/Makefile index b297c51..7fec5de 100644 --- a/external/Makefile +++ b/external/Makefile @@ -25,14 +25,14 @@ endif NDK_BASE ?= /opt/android-ndk NDK_PLATFORM_LEVEL ?= 5 NDK_ABI=arm -NDK_COMPILER_VERSION = 4.6 +NDK_COMPILER_VERSION = 4.8 NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI) APP_ABI=armeabi # NDK platform level, aka APP_PLATFORM, is equivalent to minSdkVersion APP_PLATFORM := android-$(shell sed -n 's,.*android:minSdkVersion=\([0-9][0-9]*\).*,\1,p' \ $(EXTERNAL_ROOT)/../AndroidManifest.xml) NDK_SYSROOT=$(NDK_BASE)/platforms/$(APP_PLATFORM)/arch-$(NDK_ABI) -NDK_TOOLCHAIN_VERSION=4.6 +NDK_TOOLCHAIN_VERSION=4.8 NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]') ifeq ($(NDK_ABI),x86) HOST = i686-linux-android @@ -48,8 +48,8 @@ TARGET_ARCH_ABI = $(APP_ABI) include $(NDK_BASE)/toolchains/$(NDK_TOOLCHAIN)/setup.mk CC := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-gcc --sysroot=$(NDK_SYSROOT) -CXX := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-g++ -CPP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-cpp +CXX := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-g++ --sysroot=$(NDK_SYSROOT) +CPP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-cpp --sysroot=$(NDK_SYSROOT) LD := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ld AR := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ar RANLIB := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ranlib @@ -74,6 +74,7 @@ endif iptables iptables-clean \ tor tor-clean \ obfsproxy obfsproxy-clean \ + liballium liballium-clean \ obfsclient obfsclient-clean \ privoxy privoxy-clean @@ -246,6 +247,37 @@ obfsproxy-clean: git clean -fdx #--# +# liballium + +liballium/Makefile: + cd liballium ./autogen.sh + cp config.sub liballium + cp config.guess liballium + cd liballium \ + CC=$(CC) AR=$(AR) RANLIB=$(RANLIB) CFLAGS=$(CFLAGS) -I$(EXTERNAL_ROOT)/include LDFLAGS=$(LDFLAGS) \ + ./configure \ + --host=$(HOST) \ + --disable-shared + +liballium-build-stamp: liballium/Makefile + $(MAKE) -C liballium all-am + touch liballium-build-stamp + +liballium: liballium-build-stamp + test -d lib || mkdir lib + test -d include || mkdir include + test -d include/allium || mkdir include/allium + cp liballium/.libs/liballium-1.0.a lib + cp liballium/include/* include/allium/ + +liballium-clean: + -rm -f include/allium + -rm -f lib/liballium-1.0.a + -rm -f liballium-build-stamp + -cd liballium \ + git clean -fdx + +#--# # obfsclient @@ -255,16 +287,23 @@ obfsclient/Makefile: cp config.sub obfsclient cp config.guess obfsclient cd obfsclient \ -CPP=$(CPP) CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CPPFLAGS=$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow CXXFLAGS=$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow LDFLAGS=$(LDFLAGS) \ - LIBS=-L$(EXTERNAL_ROOT)/lib CFLAGS=-I$(EXTERNAL_ROOT)/include -I$(EXTERNAL_ROOT)/include/event2 \ +CC=$(CC) CPP=$(CPP) CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) \ + CFLAGS=$(CFLAGS) -I$(EXTERNAL_ROOT)/include -I$(EXTERNAL_ROOT)/include/event2 \ + CPPFLAGS=$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow \ + CXXFLAGS=$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow -I$(NDK_BASE)/sources/cxx-stl/gnu-libstdc++/$(NDK_TOOLCHAIN_VERSION)/include -I$(NDK_BASE)/sources/cxx-stl/gnu-libstdc++/$(NDK_TOOLCHAIN_VERSION)/libs/$(APP_ABI)/include \ +LDFLAGS=$(LDFLAGS) \ + libevent_CFLAGS=-I$(EXTERNAL_ROOT)/include libevent_LIBS=-L$(EXTERNAL_ROOT)/lib \ + liballium_CFLAGS=-I$(EXTERNAL_ROOT)/include liballium_LIBS=-L$(EXTERNAL_ROOT)/lib \ + LIBS=-L$(EXTERNAL_ROOT)/lib -levent -lallium-1.0 -L$(NDK_BASE)/sources/cxx-stl/gnu-libstdc++/$(NDK_TOOLCHAIN_VERSION)/libs/$(APP_ABI)/ -lgnustl_static \ ./configure \ --host=$(HOST) \ +
[tor-commits] [orbot/master] update to new obfsclient repo
commit 2f7a9dd05202a720d977e518180c209504781655 Author: Nathan Freitas nat...@freitas.net Date: Thu Apr 24 12:30:39 2014 -0400 update to new obfsclient repo --- .gitmodules | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 927bcca..a10c91e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule external/jtorctl] path = external/jtorctl url = https://github.com/guardianproject/jtorctl -[submodule external/obfsproxy] - path = external/obfsproxy - url = https://git.torproject.org/pluggable-transports/obfsproxy-legacy.git [submodule external/ActionBarSherlock] path = external/ActionBarSherlock url = https://github.com/JakeWharton/ActionBarSherlock.git @@ -19,12 +16,13 @@ [submodule external/iptables] path = external/iptables url = git://git.netfilter.org/iptables -[submodule external/obfsclient] - path = external/obfsclient - url = https://git.torproject.org/user/yawning/obfsclient.git [submodule external/superuser-commands] path = external/superuser-commands url = https://github.com/dschuermann/superuser-commands.git [submodule external/liballium] path = external/liballium url = https://git.torproject.org/user/yawning/liballium.git +[submodule external/obfsclient] + path = external/obfsclient + url = https://git.torproject.org/user/yawning/obfsclient.git + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Tweak the changelog formatter a little.
commit 8a173635bcd85ad7375d996fb39efeaddd8c611d Author: Nick Mathewson ni...@torproject.org Date: Fri May 2 12:50:23 2014 -0400 Tweak the changelog formatter a little. (I had a bad clone of Knuth's algorithm sitting around in an old code repository of mine. I added orphan detection and smarter hyphenation; it seems to give marginally better results than we had before.) --- scripts/maint/format_changelog.py | 139 +++-- 1 file changed, 134 insertions(+), 5 deletions(-) diff --git a/scripts/maint/format_changelog.py b/scripts/maint/format_changelog.py index 6997d95..35044b3 100755 --- a/scripts/maint/format_changelog.py +++ b/scripts/maint/format_changelog.py @@ -12,7 +12,135 @@ import os import re import sys -import textwrap + +# == +# Oh, look! It's a cruddy approximation to Knuth's elegant text wrapping +# algorithm, with totally ad hoc parameters! +# +# We're trying to minimize: +#The total of the cubes of ragged space on underflowed intermediate lines, +# PLUS +#100 * the fourth power of overflowed characters +# PLUS +#.1 * a bit more than the cube of ragged space on the last line. +# +# We use an obvious dynamic programming algorithm to sorta approximate this. +# It's not coded right or optimally, but it's fast enough for changelogs +# +# (Code found in an old directory of mine, lightly cleaned. -NM) + +NO_HYPHENATE=set( +pf-divert +.split()) + +LASTLINE_UNDERFLOW_EXPONENT = 1 +LASTLINE_UNDERFLOW_PENALTY = 1 + +UNDERFLOW_EXPONENT = 3 +UNDERFLOW_PENALTY = 1 + +OVERFLOW_EXPONENT = 4 +OVERFLOW_PENALTY = 2000 + +ORPHAN_PENALTY = 1 + +def generate_wrapping(words, divisions): +lines = [] +last = 0 +for i in divisions: +w = words[last:i] +last = i +line = .join(w).replace(\xff ,-).replace(\xff,-) +lines.append(line) +return lines + +def wrapping_quality(words, divisions, width1, width2): +total = 0.0 + +lines = generate_wrapping(words, divisions) +for line in lines: +length = len(line) +if line is lines[0]: +width = width1 +else: +width = width2 + +if length width: +total += OVERFLOW_PENALTY * ( +(length - width) ** OVERFLOW_EXPONENT ) +else: +if line is lines[-1]: +e,p = (LASTLINE_UNDERFLOW_EXPONENT, LASTLINE_UNDERFLOW_PENALTY) +if not in line: +total += ORPHAN_PENALTY +else: +e,p = (UNDERFLOW_EXPONENT, UNDERFLOW_PENALTY) + +total += p * ((width - length) ** e) + +return total + +def wrap_graf(words, prefix_len1=0, prefix_len2=0, width=72): +wrapping_after = [ (0,), ] + +w1 = width - prefix_len1 +w2 = width - prefix_len2 + +for i in range(1, len(words)+1): +best_so_far = None +best_score = 1e300 +for j in range(i): +t = wrapping_after[j] +t1 = t[:-1] + (i,) +t2 = t + (i,) +wq1 = wrapping_quality(words, t1, w1, w2) +wq2 = wrapping_quality(words, t2, w1, w2) + +if wq1 best_score: +best_so_far = t1 +best_score = wq1 +if wq2 best_score: +best_so_far = t2 +best_score = wq2 +wrapping_after.append( best_so_far ) + +lines = generate_wrapping(words, wrapping_after[-1]) + +return lines + +def hyphenateable(word): +if re.match(r'^[^\d\-].*-', word): +stripped = re.sub(r'^\W+','',word) +stripped = re.sub(r'\W+$','',word) +return stripped not in NO_HYPHENATE +else: +return False + +def split_paragraph(s): +Split paragraph into words; tuned for Tor. + +r = [] +for word in s.split(): +if hyphenateable(word): +while - in word: +a,word = word.split(-,1) +r.append(a+\xff) +r.append(word) +return r + +def fill(text, width, initial_indent, subsequent_indent): +words = split_paragraph(text) +lines = wrap_graf(words, len(initial_indent), len(subsequent_indent), + width) +res = [ initial_indent, lines[0], \n ] +for line in lines[1:]: +res.append(subsequent_indent) +res.append(line) +res.append(\n) +return .join(res) + +# == + TP_MAINHEAD = 0 TP_HEADTEXT = 1 @@ -108,10 +236,11 @@ class ChangeLog(object): if indent2 == -1: indent2 = indent1 text = .join(re.sub(r'\s+', ' ', line.strip()) for line in par) -print textwrap.fill(text, width=72, -initial_indent= *indent1, -subsequent_indent= *indent2, -break_on_hyphens=False) + +sys.stdout.write(fill(text, + width=72, +
[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed
commit 2e9da49090dae907570767b9ed1a8822e42841d4 Author: Translation commit bot translat...@torproject.org Date: Fri May 2 17:15:40 2014 + Update translations for tails-misc_completed --- fr_CA.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index 58d7f7a..5edefb6 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -12,8 +12,8 @@ msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2014-04-27 19:29+0200\n -PO-Revision-Date: 2014-04-30 09:10+\n -Last-Translator: runasand runa.sand...@gmail.com\n +PO-Revision-Date: 2014-05-02 17:00+\n +Last-Translator: Alain-Olivier Breysse\n Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -226,7 +226,7 @@ msgstr Redémarrer immédiatement #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:72 msgid Shutdown Helper -msgstr Assistant d'arrêt +msgstr Assistant d'extinction #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid not available ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] Update translations for tails-misc
commit 821e8b5f9c0222d8b672a42f37e7348cb10d5cc3 Author: Translation commit bot translat...@torproject.org Date: Fri May 2 17:15:38 2014 + Update translations for tails-misc --- fr_CA.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index 58d7f7a..5edefb6 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -12,8 +12,8 @@ msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2014-04-27 19:29+0200\n -PO-Revision-Date: 2014-04-30 09:10+\n -Last-Translator: runasand runa.sand...@gmail.com\n +PO-Revision-Date: 2014-05-02 17:00+\n +Last-Translator: Alain-Olivier Breysse\n Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -226,7 +226,7 @@ msgstr Redémarrer immédiatement #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:72 msgid Shutdown Helper -msgstr Assistant d'arrêt +msgstr Assistant d'extinction #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid not available ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r26759: {website} Update the source links on the tor browser details page. (website/trunk/projects/en)
Author: mikeperry Date: 2014-05-02 18:08:57 + (Fri, 02 May 2014) New Revision: 26759 Modified: website/trunk/projects/en/torbrowser-details.wml Log: Update the source links on the tor browser details page. Modified: website/trunk/projects/en/torbrowser-details.wml === --- website/trunk/projects/en/torbrowser-details.wml2014-05-01 17:34:09 UTC (rev 26758) +++ website/trunk/projects/en/torbrowser-details.wml2014-05-02 18:08:57 UTC (rev 26759) @@ -35,13 +35,18 @@ h3 id=buildBuilding the bundle/h3 -pTo re-build the bundle, download the a - href=../dist/torbrowser/tor-browser-version-torbrowserbundle-src.tar.gzsource -distribution/a (a - href=../dist/torbrowser/tor-browser-version-torbrowserbundle-src.tar.gz.ascsignature/a). -See a href=https://gitweb.torproject.org/torbrowser.git/tree;README/a for -the directory layout and changelog. Build instructions can be found in a -href=tbbrepo/build-scripts/INSTALLbuild-scripts/INSTALL/a./p + pWe use a +href=https://blog.torproject.org/blog/deterministic-builds-part-two-technical-details;Gitian/a +to ensure that byte-for-byte reproducible packages can be built from our +source repository by anyone. To re-build the bundle, check out the a +href=https://gitweb.torproject.org/builders/tor-browser-bundle.git;Tor +Browser builder repository/a and see the a +href=https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/gitian/README.build;README.build/a +for instructions. You may also find the a +href=https://trac.torproject.org/projects/tor/wiki/doc/TorBrowser/Hacking;Tor +Browser Hacking/a intro document useful for learning about the build system +and our development processes. + /div !-- END MAINCOL -- div id = sidecol ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] for some devices, the process-id is listed first
commit 42d8ca1377e64559b685a1dbbd3cf26bb5899618
Author: Nathan Freitas nat...@freitas.net
Date: Fri May 2 14:58:47 2014 -0400
for some devices, the process-id is listed first
---
src/org/torproject/android/service/TorServiceUtils.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/org/torproject/android/service/TorServiceUtils.java
b/src/org/torproject/android/service/TorServiceUtils.java
index be1694e..70c5746 100644
--- a/src/org/torproject/android/service/TorServiceUtils.java
+++ b/src/org/torproject/android/service/TorServiceUtils.java
@@ -89,9 +89,17 @@ public class TorServiceUtils implements TorServiceConstants {
{
if (line.contains(command))
{
+
String[] lineParts = line.split(\\s+);
- procId = Integer.parseInt(lineParts[1]);
+ try {
+
+ procId = Integer.parseInt(lineParts[1]); //for most
devices it is the second number
+ } catch(NumberFormatException e) {
+ procId = Integer.parseInt(lineParts[0]); //but for
samsungs it is the first
+
+ }
+
break;
}
___
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 the unbind intent is not null
commit fd5128170a63dcd1087b2ebf1c8a1201f6b7e844
Author: Nathan Freitas nat...@freitas.net
Date: Fri May 2 14:58:36 2014 -0400
make sure the unbind intent is not null
---
src/org/torproject/android/service/TorService.java |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/org/torproject/android/service/TorService.java
b/src/org/torproject/android/service/TorService.java
index 97e2851..13c653c 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -186,7 +186,8 @@ public class TorService extends Service implements
TorServiceConstants, TorConst
@Override
public boolean onUnbind(Intent intent) {
- logNotice( onUnbind Called: + intent.getAction());
+ if (intent != null)
+ logNotice( onUnbind Called: + intent.getAction());
return super.onUnbind(intent);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] update 14.0.0-ALPHA-2a for some testers (samsung)
commit 9096f8c7b86f2940a037a010ae8539d5d95e00e5 Author: Nathan Freitas nat...@freitas.net Date: Fri May 2 14:59:18 2014 -0400 update 14.0.0-ALPHA-2a for some testers (samsung) --- AndroidManifest.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9b4bee9..f6f1c5d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.torproject.android - android:versionName=14.0.0-ALPHA-2 - android:versionCode=89 + android:versionName=14.0.0-ALPHA-2a + android:versionCode=90 android:installLocation=auto ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torcheck] Update translations for torcheck
commit 294b3ba29cb7473cea6f95f8f76a6ba74aed70a1 Author: Translation commit bot translat...@torproject.org Date: Fri May 2 19:15:11 2014 + Update translations for torcheck --- de/torcheck.po |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/de/torcheck.po b/de/torcheck.po index ebbae22..f0fb985 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -6,13 +6,14 @@ # LaKoon lak...@posteo.org, 2011 # MarioBaier26 mario.baie...@gmx.de, 2013 # Zweimaldhaelfti sacha.bis...@windowslive.com, 2014 +# si.mueller1 si.muell...@web.de, 2014 # to_ba, 2013-2014 msgid msgstr Project-Id-Version: The Tor Project\n POT-Creation-Date: 2012-02-16 20:28+PDT\n -PO-Revision-Date: 2014-04-30 07:20+\n -Last-Translator: axcer ax...@gmx.de\n +PO-Revision-Date: 2014-05-02 19:01+\n +Last-Translator: si.mueller1 si.muell...@web.de\n Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -22,7 +23,7 @@ msgstr Plural-Forms: nplurals=2; plural=(n != 1);\n msgid Congratulations. This browser is configured to use Tor. -msgstr Herzlichen Glückwunsch. Ihr Browser benutzt jetzt Tor +msgstr Herzlichen Glückwunsch. Dieser Browser unterstützt nun Tor. msgid Please refer to the a href=\https://www.torproject.org/\;Tor website/a @@ -57,7 +58,7 @@ msgid msgstr Eine temporäre Störung des Systems hindert uns daran zu erkennen ob Ihre IP-Adresse ein a href=\https://www.torproject.org/\;Tor/a-Knoten ist. msgid Your IP address appears to be: -msgstr Ihre IP-Adresse scheint folgende zu sein: +msgstr Ihre IP-Adresse scheint Folgende zu sein: msgid Are you using Tor? msgstr Benutzen Sie Tor? ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torcheck_completed] Update translations for torcheck_completed
commit d7e7e2a11776dbd130fdb7d280888339c9575c39 Author: Translation commit bot translat...@torproject.org Date: Fri May 2 19:15:13 2014 + Update translations for torcheck_completed --- de/torcheck.po |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/de/torcheck.po b/de/torcheck.po index ebbae22..f0fb985 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -6,13 +6,14 @@ # LaKoon lak...@posteo.org, 2011 # MarioBaier26 mario.baie...@gmx.de, 2013 # Zweimaldhaelfti sacha.bis...@windowslive.com, 2014 +# si.mueller1 si.muell...@web.de, 2014 # to_ba, 2013-2014 msgid msgstr Project-Id-Version: The Tor Project\n POT-Creation-Date: 2012-02-16 20:28+PDT\n -PO-Revision-Date: 2014-04-30 07:20+\n -Last-Translator: axcer ax...@gmx.de\n +PO-Revision-Date: 2014-05-02 19:01+\n +Last-Translator: si.mueller1 si.muell...@web.de\n Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -22,7 +23,7 @@ msgstr Plural-Forms: nplurals=2; plural=(n != 1);\n msgid Congratulations. This browser is configured to use Tor. -msgstr Herzlichen Glückwunsch. Ihr Browser benutzt jetzt Tor +msgstr Herzlichen Glückwunsch. Dieser Browser unterstützt nun Tor. msgid Please refer to the a href=\https://www.torproject.org/\;Tor website/a @@ -57,7 +58,7 @@ msgid msgstr Eine temporäre Störung des Systems hindert uns daran zu erkennen ob Ihre IP-Adresse ein a href=\https://www.torproject.org/\;Tor/a-Knoten ist. msgid Your IP address appears to be: -msgstr Ihre IP-Adresse scheint folgende zu sein: +msgstr Ihre IP-Adresse scheint Folgende zu sein: msgid Are you using Tor? msgstr Benutzen Sie Tor? ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit ab8bd9980b9ee4151c932ae2bcafbd2e160af221 Author: Translation commit bot translat...@torproject.org Date: Fri May 2 20:15:36 2014 + Update translations for abouttor-homepage --- ro/aboutTor.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ro/aboutTor.dtd b/ro/aboutTor.dtd index 89b9832..7201a66 100644 --- a/ro/aboutTor.dtd +++ b/ro/aboutTor.dtd @@ -44,5 +44,5 @@ !ENTITY aboutTor.helpInfo5.link https://www.torproject.org/donate/donate.html.en; !ENTITY aboutTor.footer.label Proiectul Tor este un US 501(c)(3) non-profit care are ca scop cercetarea, dezvoltarea si educatia pentru anonimitate si confidentialitate online. -!ENTITY aboutTor.learnMore.label Learn more about The Tor Project » +!ENTITY aboutTor.learnMore.label Afla mai multe despre Proiectul Tor !ENTITY aboutTor.learnMore.link https://www.torproject.org/about/overview.html.en; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-greeter] Update translations for tails-greeter
commit 22e9f623cca54d944c37e62027a44ab542c60e0c Author: Translation commit bot translat...@torproject.org Date: Fri May 2 20:45:21 2014 + Update translations for tails-greeter --- ro/ro.po | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ro/ro.po b/ro/ro.po index c8599bb..1f45322 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -4,13 +4,14 @@ # # Translators: # icet208 icet...@yahoo.com, 2014 +# lauraberindei lauraagavril...@yahoo.com, 2014 msgid msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2014-03-17 13:54+0100\n -PO-Revision-Date: 2014-04-14 07:40+\n -Last-Translator: icet208 icet...@yahoo.com\n +POT-Creation-Date: 2014-04-27 13:07+0200\n +PO-Revision-Date: 2014-05-02 20:20+\n +Last-Translator: lauraberindei lauraagavril...@yahoo.com\n Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -24,7 +25,7 @@ msgstr Ãnainte #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 msgid Login -msgstr +msgstr Inregistrare #: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 msgid Welcome to Tails @@ -84,7 +85,7 @@ msgstr Parola: #: ../glade/optionswindow.glade.h:8 msgid Verify Password: -msgstr +msgstr Verificati Parola #: ../glade/optionswindow.glade.h:9 msgid iPasswords do not match/i @@ -138,7 +139,7 @@ msgstr #: ../glade/optionswindow.glade.h:19 msgid Network configuration -msgstr +msgstr Configurare retea #: ../glade/optionswindow.glade.h:20 msgid @@ -200,4 +201,4 @@ msgstr #: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 #: ../GdmGreeter/langpanel.py:181 msgid Other... -msgstr +msgstr Altele... ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-iuk] Update translations for tails-iuk
commit c75490b120d766c067314ec236d00bdc37f1ef9b Author: Translation commit bot translat...@torproject.org Date: Fri May 2 20:45:47 2014 + Update translations for tails-iuk --- ro.po | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ro.po b/ro.po index cb28b2f..e60277c 100644 --- a/ro.po +++ b/ro.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# lauraberindei lauraagavril...@yahoo.com, 2014 msgid msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n -POT-Creation-Date: 2014-03-05 15:11+0100\n -PO-Revision-Date: 2014-03-06 08:17+\n -Last-Translator: runasand runa.sand...@gmail.com\n +POT-Creation-Date: 2014-04-16 17:54+0200\n +PO-Revision-Date: 2014-05-02 20:30+\n +Last-Translator: lauraberindei lauraagavril...@yahoo.com\n Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -53,7 +54,7 @@ msgstr #: ../lib/Tails/IUK/Frontend.pm:255 msgid not enough memory is available on this system -msgstr +msgstr memorie insuficienta disponibila in acest sistem #: ../lib/Tails/IUK/Frontend.pm:261 #, perl-brace-format @@ -134,7 +135,7 @@ msgstr #: ../lib/Tails/IUK/Frontend.pm:411 msgid New version available -msgstr +msgstr O noua versiune disponibila #: ../lib/Tails/IUK/Frontend.pm:468 msgid Downloading upgrade @@ -188,15 +189,15 @@ msgstr #: ../lib/Tails/IUK/Frontend.pm:580 msgid Restart now -msgstr +msgstr Restartare #: ../lib/Tails/IUK/Frontend.pm:581 msgid Restart later -msgstr +msgstr Restartati mai tarziu #: ../lib/Tails/IUK/Frontend.pm:592 msgid Error while restarting the system -msgstr +msgstr Eroare in timpul restartarii sistemului #: ../lib/Tails/IUK/Frontend.pm:595 msgid Failed to restart the system ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r26760: {website} add netcologne mirror. (website/trunk/include)
Author: phobos Date: 2014-05-03 03:05:52 + (Sat, 03 May 2014) New Revision: 26760 Modified: website/trunk/include/tor-mirrors.csv Log: add netcologne mirror. Modified: website/trunk/include/tor-mirrors.csv === --- website/trunk/include/tor-mirrors.csv 2014-05-02 18:08:57 UTC (rev 26759) +++ website/trunk/include/tor-mirrors.csv 2014-05-03 03:05:52 UTC (rev 26760) @@ -91,3 +91,4 @@ tor TA ninurta TOD name, TorNinurtaName, AT, Austria, AT, TRUE, TRUE, no, http://tor.ninurta.name/, , , , http://tor.ninurta.name/dist/, , , , Wed Apr 30 13:50:52 2014 Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, no, http://tor.wasifmalik.com/, , , , http://tor.wasifmalik.com/dist/, , , , Sat Apr 26 16:04:13 2014 fr33tux AT general-changelog-team.fr, Tor Supporter, FR, France, FR, TRUE, TRUE, No, http://tor.fr33tux.org, https://tor.fr33tux.org, , , http://tor.fr33tux.org/dist/, https://tor.fr33tux.org/dist/, , , Wed Apr 30 13:50:52 2014 +mirror-serv...@netcologne.de, NetCologne GmbH, DE, NRW, TRUE, TRUE, No,http://mirror.netcologne.de/torproject.org,,rsync://mirror.netcologne.de/torproject.org,ftp://mirror.netcologne.de/torproject.org/,http://mirror.netcologne.de/torproject.org/dist, ,rsync://mirror.netcologne.de/torproject.org/dist, ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
