September 2014 - tor-commits - lists.torproject.org

[stem/master] Renaming ExitPolicy's is_default() to has_default()
by atagar＠torproject.org 07 Sep '14

07 Sep '14

commit be32881152f198a7479e4c951cfd917c4d06831c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 7 12:19:08 2014 -0700 Renaming ExitPolicy's is_default() to has_default() Renaming the ExitPolicy's new is_default() method, and adding a has_private() counterpart for private rules. Also updating our changelog and noting when several of our new additions were added. --- docs/change_log.rst | 4 ++-- stem/control.py | 11 +++++++++ stem/exit_policy.py | 49 ++++++++++++++++++++++++++++++++------- stem/socket.py | 2 ++ stem/util/proc.py | 2 ++ stem/util/str_tools.py | 2 ++ test/unit/exit_policy/policy.py | 5 ++-- 7 files changed, 63 insertions(+), 12 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 130b24f..ec7eaef 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -44,7 +44,7 @@ The following are only available within Stem's `git repository * Added :func:`~stem.control.BaseController.connection_time` to the :class:`~stem.control.BaseController` * Changed :func:`~stem.control.Controller.get_microdescriptor`, :func:`~stem.control.Controller.get_server_descriptor`, and :func:`~stem.control.Controller.get_network_status` to get our own descriptor if no fingerprint or nickname is provided. - * Added an :func:`~stem.exit_policy.ExitPolicy.strip_private` method to :class:`~stem.exit_policy.ExitPolicy` and :func:`~stem.exit_policy.ExitPolicy.is_private` to :class:`~stem.exit_policy.ExitPolicyRule` + * Added :class:`~stem.exit_policy.ExitPolicy` methods for more easily handling 'private' policies (the `default prefix <https://www.torproject.org/docs/tor-manual.html.en#ExitPolicyRejectPrivate>`_) and the defaultly appended suffix. This includes :func:`~stem.exit_policy.ExitPolicy.has_private`, :func:`~stem.exit_policy.ExitPolicy.strip_private`, :func:`~stem.exit_policy.ExitPolicy.has_default`, and :func:`~stem.exit_policy.ExitPolicy.strip_default` :class:`~stem.exit_policy.ExitPolicy` methods in addition to :func:`~stem.exit_policy.ExitPolicyRule.is_private` and :func:`~stem.exit_policy.ExitPolicyRule.is_default` for the :class:`~stem.exit_policy.ExitPolicyRule`. (:trac:`10107`) * **Descriptors** @@ -56,7 +56,7 @@ The following are only available within Stem's `git repository * Added support for directories to :func:`stem.util.conf.Config.load`. * Changed :func:`stem.util.conf.uses_settings` to only provide a 'config' keyword arument if the decorated function would accept it. * Added :func:`stem.util.str_tools.crop` - * Added :func:`stem.util.proc.get_file_descriptors_used` + * Added :func:`stem.util.proc.file_descriptors_used` * Dropped the 'get_*' prefix from most function names. Old names will still work, but are a deprecated alias. * **Interpreter** diff --git a/stem/control.py b/stem/control.py index 1b33659..c9a9a5f 100644 --- a/stem/control.py +++ b/stem/control.py @@ -485,6 +485,8 @@ class BaseController(object): disconnected. That is to say, the time we connected if we're presently connected and the time we disconnected if we're not connected. + .. versionadded:: 1.3.0 + :returns: **float** for when we last connected or disconnected, zero if we've never connected """ @@ -1317,6 +1319,9 @@ class Controller(BaseController): authorities so this both won't be available for newly started relays and may be up to around an hour out of date. + .. versionchanged:: 1.3.0 + Changed so we'd fetch our own descriptor if no 'relay' is provided. + :param str relay: fingerprint or nickname of the relay to be queried :param object default: response if the query fails @@ -1417,6 +1422,9 @@ class Controller(BaseController): really need server descriptors then you can get them by setting 'UseMicrodescriptors 0'. + .. versionchanged:: 1.3.0 + Changed so we'd fetch our own descriptor if no 'relay' is provided. + :param str relay: fingerprint or nickname of the relay to be queried :param object default: response if the query fails @@ -1526,6 +1534,9 @@ class Controller(BaseController): authorities so this both won't be available for newly started relays and may be up to around an hour out of date. + .. versionchanged:: 1.3.0 + Changed so we'd fetch our own descriptor if no 'relay' is provided. + :param str relay: fingerprint or nickname of the relay to be queried :param object default: response if the query fails diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 06f4d83..9adb699 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -30,8 +30,9 @@ exiting to a destination is permissible or not. For instance... |- can_exit_to - check if exiting to this destination is allowed or not |- is_exiting_allowed - check if any exiting is allowed |- summary - provides a short label, similar to a microdescriptor - |- is_default - checks if policy ends with the defaultly appended suffix + |- has_private - checks if policy has anything expanded from the 'private' keyword |- strip_private - provides a copy of the policy without 'private' entries + |- has_default - checks if policy ends with the defaultly appended suffix |- strip_default - provides a copy of the policy without the default suffix |- __str__ - string representation +- __iter__ - ExitPolicyRule entries that this contains @@ -45,8 +46,8 @@ exiting to a destination is permissible or not. For instance... |- is_match - checks if we match a given destination |- get_mask - provides the address representation of our mask |- get_masked_bits - provides the bit representation of our mask - |- is_private - flag indicating if this was expanded from a 'private' keyword |- is_default - flag indicating if this was part of the default end of a policy + |- is_private - flag indicating if this was expanded from a 'private' keyword +- __str__ - string representation for this rule get_config_policy - provides the ExitPolicy based on torrc rules @@ -381,15 +382,20 @@ class ExitPolicy(object): return (label_prefix + ', '.join(display_ranges)).strip() - def is_default(self): + def has_private(self): """ - Checks if we have the default policy suffix. + Checks if we have any rules expanded from the 'private' keyword. Tor + appends these by default to the start of the policy and includes a dynamic + address (the relay's public IP). - :returns: **True** if we have the default policy suffix, **False** otherwise + .. versionadded:: 1.3.0 + + :returns: **True** if we have any private rules expanded from the 'private' + keyword, **False** otherwise """ for rule in self._get_rules(): - if rule.is_default(): + if rule.is_private(): return True return False @@ -398,15 +404,34 @@ class ExitPolicy(object): """ Provides a copy of this policy without 'private' policy entries. + .. versionadded:: 1.3.0 + :returns: **ExitPolicy** without private rules """ return ExitPolicy(*[rule for rule in self._get_rules() if not rule.is_private()]) + def has_default(self): + """ + Checks if we have the default policy suffix. + + .. versionadded:: 1.3.0 + + :returns: **True** if we have the default policy suffix, **False** otherwise + """ + + for rule in self._get_rules(): + if rule.is_default(): + return True + + return False + def strip_default(self): """ Provides a copy of this policy without the default policy suffix. + .. versionadded:: 1.3.0 + :returns: **ExitPolicy** without default rules """ @@ -791,14 +816,22 @@ class ExitPolicyRule(object): def is_private(self): """ - True if this rule was expanded from the 'private' keyword, False otherwise. + Checks if this rule was expanded from the 'private' policy keyword. + + .. versionadded:: 1.3.0 + + :returns: **True** if this rule was expanded from the 'private' keyword, **False** otherwise. """ return self._is_private def is_default(self): """ - True if this rule was part of the default end of a policy, False otherwise. + Checks if this rule belongs to the default exit policy suffix. + + .. versionadded:: 1.3.0 + + :returns: **True** if this rule was part of the default end of a policy, **False** otherwise. """ return self._is_default_suffix diff --git a/stem/socket.py b/stem/socket.py index e25f385..7991899 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -211,6 +211,8 @@ class ControlSocket(object): disconnected. That is to say, the time we connected if we're presently connected and the time we disconnected if we're not connected. + .. versionadded:: 1.3.0 + :returns: **float** for when we last connected or disconnected, zero if we've never connected """ diff --git a/stem/util/proc.py b/stem/util/proc.py index 184e450..c7cb5ce 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -301,6 +301,8 @@ def file_descriptors_used(pid): """ Provides the number of file descriptors currently being used by a process. + .. versionadded:: 1.3.0 + :param int pid: process id of the process to be queried :returns: **int** of the number of file descriptors used diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index 33ecb84..16681d5 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -173,6 +173,8 @@ def crop(msg, size, min_word_length = 4, min_crop = 0, ending = Ending.ELLIPSE, such details of how this works might change in the future. Callers should not rely on the details of how this crops. + .. versionadded:: 1.3.0 + :param str msg: text to be processed :param int size: space available for text :param int min_word_length: minimum characters before which a word is diff --git a/test/unit/exit_policy/policy.py b/test/unit/exit_policy/policy.py index a1ee390..406ef62 100644 --- a/test/unit/exit_policy/policy.py +++ b/test/unit/exit_policy/policy.py @@ -104,7 +104,8 @@ class TestExitPolicy(unittest.TestCase): self.assertFalse(rule.is_private()) self.assertFalse(rule.is_default()) - self.assertFalse(policy.is_default()) + self.assertFalse(policy.has_private()) + self.assertFalse(policy.has_default()) self.assertEqual(policy, policy.strip_private()) self.assertEqual(policy, policy.strip_default()) @@ -129,7 +130,7 @@ class TestExitPolicy(unittest.TestCase): for rule in policy: self.assertTrue(rule.is_default()) - self.assertTrue(policy.is_default()) + self.assertTrue(policy.has_default()) self.assertEqual(ExitPolicy(), policy.strip_default()) def test_mixed_private_policy(self):

1 0

[doctor/master] Disabling unmeasured relay check
by atagar＠torproject.org 07 Sep '14

07 Sep '14

commit d7f5486ec351a87ad779d104db871f0544e78e81 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 7 10:51:35 2014 -0700 Disabling unmeasured relay check This is a known issue. No reason to continue making noise for it until it's sorted out. --- consensus_health_checker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index a90cde3..9ae9f8d 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -244,7 +244,7 @@ def run_checks(consensuses, votes): consensuses_have_same_votes, has_all_signatures, voting_bandwidth_scanners, - unmeasured_relays, + #unmeasured_relays, has_authority_flag, is_recommended_versions, bad_exits_in_sync,

1 0

[orbot/master] update to 14.0.7.3
by n8fr8＠torproject.org 07 Sep '14

07 Sep '14

commit d1b08ee4e8777c24f49751095063fb5880193439 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 28 23:24:38 2014 -0400 update to 14.0.7.3 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7841cf8..c98e643 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.7.2" - android:versionCode="121" + android:versionName="14.0.7.3" + android:versionCode="122" android:installLocation="auto" >

1 0

[orbot/master] don't manually call onDestroy, just call finish()
by n8fr8＠torproject.org 07 Sep '14

07 Sep '14

commit a0b32ba068c82525d6984ba6cd5e44a1333dd9cf Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Aug 29 00:16:31 2014 -0400 don't manually call onDestroy, just call finish() --- src/org/torproject/android/Orbot.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 87276ef..209896d 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -432,7 +432,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic //terminology but also making sure there are clear distinctions in control stopTor(); - onDestroy(); + //onDestroy(); + } catch (RemoteException e) { Log.w(TAG, e); @@ -448,11 +449,17 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic * @see android.app.Activity#onPause() */ protected void onPause() { - super.onPause(); - - if (aDialog != null) - aDialog.dismiss(); - + try + { + super.onPause(); + + if (aDialog != null) + aDialog.dismiss(); + } + catch (IllegalStateException ise) + { + //can happen on exit/shutdown + } } private void doTorCheck ()

1 0

[orbot/master] improve error handling of tor startup sequence
by n8fr8＠torproject.org 07 Sep '14

07 Sep '14

commit b8912adbfbe7aef86801509d825f638d15a8c571 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 28 23:23:55 2014 -0400 improve error handling of tor startup sequence don't use executor thread pool for time critical commands --- src/org/torproject/android/service/TorService.java | 97 +++++++++++++------- 1 file changed, 66 insertions(+), 31 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 8a43dba..9d91883 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -177,7 +177,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - mLastProcessId = initControlConnection(1); + mLastProcessId = initControlConnection(3); if (mLastProcessId != -1 && conn != null) { @@ -346,7 +346,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst updateSettings (); - mExecutor.execute (new TorStarter(intent)); + new Thread (new TorStarter(intent)).start(); return Service.START_STICKY; @@ -380,12 +380,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - - if (mIntent != null && mIntent.getAction()!=null && mIntent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) - { - setTorProfile(PROFILE_ON); - } + } + + //if this is a start on boot launch turn tor on + if (mIntent != null && mIntent.getAction()!=null && mIntent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) + { + setTorProfile(PROFILE_ON); + } } catch (Exception e) { @@ -405,9 +407,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst super.onDestroy(); logNotice("TorService is being destroyed... shutting down!"); - - //stopTor(); - + unregisterReceiver(mNetworkStateReceiver); } @@ -587,6 +587,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst catch (Exception e) { Log.e(TAG,"error onBind",e); + logNotice("error finding exiting process: " + e.toString()); } } @@ -738,7 +739,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst prefPersistNotifications = prefs.getBoolean(TorConstants.PREF_PERSIST_NOTIFICATIONS, true); - updateTorConfigFile(); } public void initTor () throws Exception @@ -759,17 +759,25 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice(getString(R.string.status_starting_up)); sendCallbackStatusMessage(getString(R.string.status_starting_up)); - runTorShellCmd(); - runPolipoShellCmd(); + boolean success = runTorShellCmd(); - if (mHasRoot && mEnableTransparentProxy) + if (success) { - disableTransparentProxy(); - enableTransparentProxy(); + runPolipoShellCmd(); + + if (mHasRoot && mEnableTransparentProxy) + { + disableTransparentProxy(); + enableTransparentProxy(); + } + + getHiddenServiceHostname (); + } + else + { + showToolbarNotification(getString(R.string.unable_to_start_tor), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + } - - getHiddenServiceHostname (); - } private boolean flushTransparentProxyRules () throws Exception @@ -908,11 +916,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst Shell mShellTor; - private void runTorShellCmd() throws Exception + private boolean runTorShellCmd() throws Exception { String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getCanonicalPath(); + updateTorConfigFile(); + sendCallbackStatusMessage(getString(R.string.status_starting_up)); if (mShellTor != null) @@ -921,13 +931,41 @@ public class TorService extends Service implements TorServiceConstants, TorConst //start Tor in the background mShellTor = Shell.startShell(); - SimpleCommand shellTorCommand = new SimpleCommand(fileTor.getCanonicalPath() + String torCmdString = fileTor.getCanonicalPath() + " DataDirectory " + appCacheHome.getCanonicalPath() + " --defaults-torrc " + torrcPath - + " -f " + torrcPath + ".custom"); + + " -f " + torrcPath + ".custom"; + + debug(torCmdString); + + SimpleCommand shellTorCommand = new SimpleCommand(torCmdString + " --verify-config"); + mShellTor.add(shellTorCommand).waitForFinish(); + + int exitCode = shellTorCommand.getExitCode(); + String output = shellTorCommand.getOutput(); + + if (exitCode != 0 && output != null && output.length() > 0) + { + logNotice("Tor (" + exitCode + "): " + output); + throw new Exception ("Torrc config did not verify"); + + } + + shellTorCommand = new SimpleCommand(torCmdString); + mShellTor.add(shellTorCommand).waitForFinish(); - mShellTor.add(shellTorCommand); + exitCode = shellTorCommand.getExitCode(); + output = shellTorCommand.getOutput(); + + if (exitCode != 0 && output != null && output.length() > 0) + { + logNotice("Tor (" + exitCode + "): " + output); + //throw new Exception ("unable to start"); + return false; + } + + //now try to connect mLastProcessId = initControlConnection (100); @@ -948,7 +986,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - + return true; } private void updatePolipoConfig () throws FileNotFoundException, IOException @@ -1014,7 +1052,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - private synchronized int initControlConnection (int maxTries) throws Exception, RuntimeException + private int initControlConnection (int maxTries) throws Exception, RuntimeException { int i = 0; int controlPort = -1; @@ -1275,10 +1313,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst catch (Exception e) { - stopTor(); logException("Unable to start Tor: " + e.toString(),e); currentStatus = STATUS_OFF; showToolbarNotification(getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + stopTor(); } } else @@ -1573,11 +1611,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst public IBinder onBind(Intent intent) { - return mBinder; } - - /** * The IRemoteInterface is defined through IDL @@ -1592,7 +1627,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void setProfile (final int profileNew) { - mExecutor.execute(new Runnable() + new Thread(new Runnable() { @Override @@ -1600,7 +1635,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst setTorProfile(profileNew); } - }); + }).start(); }

1 0

[orbot/master] fix for reconnecting to exiting Tor process after service restart
by n8fr8＠torproject.org 07 Sep '14

07 Sep '14

commit 9c4c3496f1c25b041980426d0e7c40e5c02df50a Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Sep 3 22:45:31 2014 -0400 fix for reconnecting to exiting Tor process after service restart --- src/org/torproject/android/Orbot.java | 13 ++ .../torproject/android/service/ITorService.aidl | 6 + src/org/torproject/android/service/TorService.java | 238 ++++++++++++++------ 3 files changed, 184 insertions(+), 73 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 209896d..5300dea 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -590,6 +590,14 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic { try { startTor(); + + + Intent nResult = new Intent(); + + //nResult.putExtra("socks", ); //TODO respond with socks, transport, dns, etc + + setResult(RESULT_OK,nResult); + } catch (RemoteException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -631,6 +639,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic pEdit.putBoolean(TorConstants.PREF_BRIDGES_ENABLED,true); pEdit.commit(); + + setResult(RESULT_OK); } } } @@ -821,6 +831,9 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic torStatus = mService.getStatus(); + if (torStatus == 0) //make sure we don't have a tor process already running + mService.checkAndInit(); + handleIntents(); } catch (RemoteException e) { // TODO Auto-generated catch block diff --git a/src/org/torproject/android/service/ITorService.aidl b/src/org/torproject/android/service/ITorService.aidl index 07b08a0..e1f2812 100644 --- a/src/org/torproject/android/service/ITorService.aidl +++ b/src/org/torproject/android/service/ITorService.aidl @@ -12,6 +12,12 @@ interface ITorService { int getStatus(); /** + * check for exiting Tor process + **/ + boolean checkAndInit (); + + + /** * The profile value is the start/stop state for Tor **/ void setProfile(int profile); diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 9d91883..1dd39f8 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -177,7 +177,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - mLastProcessId = initControlConnection(3); + mLastProcessId = initControlConnection(3,true); if (mLastProcessId != -1 && conn != null) { @@ -570,7 +570,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst @Override public void onCreate() { super.onCreate(); - + initialize(); + } + + private void initialize() + { try { initBinariesAndDirectories(); @@ -656,11 +660,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst String TORRC_CONTROLPORT_FILE_KEY = "ControlPortWriteToFile"; fileControlPort = new File(appBinHome,"control.txt"); extraLines.append(TORRC_CONTROLPORT_FILE_KEY).append(' ').append(fileControlPort.getCanonicalPath()).append('\n'); - - String transPort = prefs.getString("pref_transport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+""); - String dnsPort = prefs.getString("pref_dnsport", TorServiceConstants.TOR_DNS_PORT_DEFAULT+""); - if (mTransProxyTethering) { extraLines.append("TransListenAddress 0.0.0.0").append('\n'); @@ -676,8 +676,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst extraLines.append("TestSocks 0").append('\n'); extraLines.append("WarnUnsafeSocks 1").append('\n'); - extraLines.append("TransPort ").append(transPort).append('\n'); - extraLines.append("DNSPort ").append(dnsPort).append('\n'); + extraLines.append("TransPort ").append("auto").append('\n'); + extraLines.append("DNSPort ").append("auto").append('\n'); extraLines.append("VirtualAddrNetwork 10.192.0.0/10").append('\n'); extraLines.append("AutomapHostsOnResolve 1").append('\n'); @@ -741,7 +741,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - public void initTor () throws Exception + public void startTor () throws Exception { currentStatus = STATUS_CONNECTING; @@ -965,9 +965,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst return false; } - //now try to connect - mLastProcessId = initControlConnection (100); + mLastProcessId = initControlConnection (100,false); if (mLastProcessId == -1) { @@ -1052,7 +1051,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - private int initControlConnection (int maxTries) throws Exception, RuntimeException + private int initControlConnection (int maxTries, boolean isReconnect) throws Exception, RuntimeException { int i = 0; int controlPort = -1; @@ -1076,46 +1075,83 @@ public class TorService extends Service implements TorServiceConstants, TorConst conn = new TorControlConnection(torConnSocket); conn.launchThread(true);//is daemon - logNotice( "SUCCESS connected to Tor control port."); + break; + } + + } + catch (Exception ce) + { + conn = null; + logException( "Error connecting to Tor local control port: " + ce.getMessage(),ce); + + } + + + try { + logNotice("waiting..."); + Thread.sleep(1000); } + catch (Exception e){} + + + + } + + if (conn != null) + { + logNotice( "SUCCESS connected to Tor control port."); + + File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); + + if (fileCookie.exists()) + { + byte[] cookie = new byte[(int)fileCookie.length()]; + DataInputStream fis = new DataInputStream(new FileInputStream(fileCookie)); + fis.read(cookie); + fis.close(); + conn.authenticate(cookie); + + logNotice( "SUCCESS - authenticated to control port."); - File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); + sendCallbackStatusMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete)); + + addEventHandler(); + + String torProcId = conn.getInfo("process/pid"); - if (fileCookie.exists()) + //remove this for now until we can make a clean way to share logs from internal storage + /** + if (ENABLE_DEBUG_LOG) { - byte[] cookie = new byte[(int)fileCookie.length()]; - DataInputStream fis = new DataInputStream(new FileInputStream(fileCookie)); - fis.read(cookie); - fis.close(); - conn.authenticate(cookie); - - logNotice( "SUCCESS - authenticated to control port."); - - sendCallbackStatusMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete)); - - addEventHandler(); - - String torProcId = conn.getInfo("process/pid"); - - //remove this for now until we can make a clean way to share logs from internal storage - /** - if (ENABLE_DEBUG_LOG) - { - File fileLog2 = new File(getFilesDir(),"orbot-tor-log.txt"); - fileLog2.setReadable(true); - conn.setConf("Log", "debug file " + fileLog2.getCanonicalPath()); - }*/ - - currentStatus = STATUS_CONNECTING; - - String confSocks = conn.getInfo("net/listeners/socks"); - StringTokenizer st = new StringTokenizer(confSocks," "); - - confSocks = st.nextToken().split(":")[1]; - confSocks = confSocks.substring(0,confSocks.length()-1); - mPortSOCKS = Integer.parseInt(confSocks); - + File fileLog2 = new File(getFilesDir(),"orbot-tor-log.txt"); + fileLog2.setReadable(true); + conn.setConf("Log", "debug file " + fileLog2.getCanonicalPath()); + }*/ + + currentStatus = STATUS_CONNECTING; + + String confSocks = conn.getInfo("net/listeners/socks"); + StringTokenizer st = new StringTokenizer(confSocks," "); + + confSocks = st.nextToken().split(":")[1]; + confSocks = confSocks.substring(0,confSocks.length()-1); + mPortSOCKS = Integer.parseInt(confSocks); + + if (!isReconnect) //if we are reconnected then we don't need to reset the ports + { + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + String socksPortPref = prefs.getString(TorConstants.PREF_SOCKS, TorServiceConstants.PORT_SOCKS_DEFAULT); + if (socksPortPref.indexOf(':')!=-1) + socksPortPref = socksPortPref.split(":")[1]; + + String transPort = prefs.getString("pref_transport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+""); + if (transPort.indexOf(':')!=-1) + transPort = transPort.split(":")[1]; + + String dnsPort = prefs.getString("pref_dnsport", TorServiceConstants.TOR_DNS_PORT_DEFAULT+""); + if (dnsPort.indexOf(':')!=-1) + dnsPort = dnsPort.split(":")[1]; try { @@ -1126,7 +1162,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst ArrayList<String> socksLines = new ArrayList<String>(); socksLines.add("SOCKSPort " + mPortSOCKS); socksLines.add("SOCKSPort " + socksPortPref); - + conn.setConf(socksLines); mPortSOCKS = newSocksPort; @@ -1136,37 +1172,69 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - //sendCallbackLogMessage("ERROR adding SOCKS on port: " + socksPortPref); - sendCallbackLogMessage("Local SOCKS port: " + socksPortPref); + sendCallbackLogMessage("Error setting TransProxy port to: " + socksPortPref); + } - return Integer.parseInt(torProcId); - - } - else - { - logNotice ("Tor authentication cookie does not exist yet"); - conn = null; - + try + { + int newPort = Integer.parseInt(transPort); + ServerSocket ss = new ServerSocket(newPort); + ss.close(); + + ArrayList<String> confLines = new ArrayList<String>(); + + confLines.add("TransPort " + transPort); + + conn.setConf(confLines); + + sendCallbackLogMessage("Local TransProxy port: " + transPort); + + } + catch (Exception e) + { + sendCallbackLogMessage("ERROR setting TransProxy port to: " + transPort); + + + + } + + try + { + int newPort = Integer.parseInt(dnsPort); + ServerSocket ss = new ServerSocket(newPort); + ss.close(); + + ArrayList<String> confLines = new ArrayList<String>(); + + confLines.add("DNSPort " + dnsPort); + + conn.setConf(confLines); + + sendCallbackLogMessage("Local DNSPort port: " + transPort); + + } + catch (Exception e) + { + sendCallbackLogMessage("ERROR setting DNSport to: " + dnsPort); + + + } } - } + + return Integer.parseInt(torProcId); + } + else + { + logNotice ("Tor authentication cookie does not exist yet"); + conn = null; + + } } - catch (Exception ce) - { - conn = null; - logException( "Error connecting to Tor local control port: " + ce.getMessage(),ce); - - } - - try { - logNotice("waiting..."); - Thread.sleep(1000); } - catch (Exception e){} - } - + return -1; } @@ -1307,7 +1375,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - initTor(); + startTor(); } catch (Exception e) @@ -1614,6 +1682,26 @@ public class TorService extends Service implements TorServiceConstants, TorConst return mBinder; } + public boolean checkAndInitImpl () + { + if (fileTor != null) + { + try { + if (TorServiceUtils.findProcessId(fileTor.getCanonicalPath()) != -1) + { + initialize(); + return true; + } + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + return false; + } + /** * The IRemoteInterface is defined through IDL */ @@ -1624,6 +1712,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst } + public boolean checkAndInit () { + return checkAndInitImpl(); + } + public void setProfile (final int profileNew) {

1 0

[orbot/master] add warning about restarting Orbot after settings changes
by n8fr8＠torproject.org 07 Sep '14

07 Sep '14

commit 313c92f863154b38cb3d37ff150eabbe0f7554f3 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Sep 6 01:02:38 2014 -0400 add warning about restarting Orbot after settings changes --- res/values/strings.xml | 3 +++ src/org/torproject/android/Orbot.java | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 8e1df63..e5819c0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -293,5 +293,8 @@ <string name="pref_transproxy_flush_title">Transproxy FORCE REMOVE</string> <string name="pref_transproxy_flush_summary">Tap here to flush all transproxy network rules NOW</string> + <string name="transparent_proxy_rules_flushed_">Transparent proxy rules flushed!</string> + <string name="you_do_not_have_root_access_enabled">You do not have ROOT access enabled</string> + <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">You may need to stop and start Orbot for settings change to be enabled.</string> </resources> diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index c448ed9..d5cd9da 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -790,6 +790,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic protected void onActivityResult(int request, int response, Intent data) { super.onActivityResult(request, response, data); + if (request == 1 && response == RESULT_OK) { if (data != null && data.getBooleanExtra("transproxywipe", false)) @@ -801,19 +802,24 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic if (result) { - Toast.makeText(this, "Transparent proxy rules flushed!", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, R.string.transparent_proxy_rules_flushed_, Toast.LENGTH_SHORT).show(); } else { - Toast.makeText(this, "You do not have ROOT access enabled", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, R.string.you_do_not_have_root_access_enabled, Toast.LENGTH_SHORT).show(); } } catch (RemoteException e) { e.printStackTrace(); } } + else + { + Toast.makeText(this, R.string.you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_, Toast.LENGTH_SHORT).show(); + + } } }

1 0

[orbot/master] more tuning of Tor service startup and status checking
by n8fr8＠torproject.org 07 Sep '14

07 Sep '14

commit 8ee5e9e0fbe0f5c1561b9fee6a2178d15b14faff Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Sep 6 00:46:57 2014 -0400 more tuning of Tor service startup and status checking --- src/org/torproject/android/Orbot.java | 22 ++++---- src/org/torproject/android/service/TorService.java | 59 +++++++++----------- .../android/service/TorServiceConstants.java | 3 - 3 files changed, 38 insertions(+), 46 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 5300dea..c448ed9 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -17,7 +17,7 @@ import org.torproject.android.wizard.ChooseLocaleWizardActivity; import org.torproject.android.wizard.TipsAndTricks; import android.app.AlertDialog; -import android.app.NotificationManager; +import android.app.ProgressDialog; import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; @@ -101,10 +101,10 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } + ProgressDialog mProgressDialog; private void startService () { - appendLogTextAndScroll("starting Tor background service... "); Intent torService = new Intent(this, TorService.class); startService(torService); @@ -112,7 +112,9 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic bindService(torService, mConnection, Context.BIND_AUTO_CREATE); - + appendLogTextAndScroll("starting Tor background service... "); + mProgressDialog = ProgressDialog.show(this, "", getString(R.string.status_starting_up), true); + } private void doLayout () @@ -124,11 +126,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic lblStatus.setOnLongClickListener(this); imgStatus = (ImageProgressView)findViewById(R.id.imgStatus); imgStatus.setOnLongClickListener(this); - imgStatus.setOnTouchListener(this); - imgStatus.setEnabled(false); - lblStatus.setText("Initializing the application..."); downloadText = (TextView)findViewById(R.id.trafficDown); @@ -983,7 +982,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic // this is a bit of a strange/old/borrowed code/design i used to change the service state // not sure it really makes sense when what we want to say is just "startTor" - mService.setProfile(TorServiceConstants.PROFILE_ON); //this means turn on + mService.setProfile(TorServiceConstants.STATUS_ON); //this means turn on //here we update the UI which is a bit sloppy and mixed up code wise //might be best to just call updateStatus() instead of directly manipulating UI in this method - yep makes sense @@ -1010,7 +1009,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic { if (mService != null) { - mService.setProfile(TorServiceConstants.PROFILE_OFF); + mService.setProfile(TorServiceConstants.STATUS_OFF); Message msg = mHandler.obtainMessage(TorServiceConstants.DISABLE_TOR_MSG); mHandler.sendMessage(msg); @@ -1200,6 +1199,9 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic public void onServiceConnected(ComponentName className, IBinder service) { + if (mProgressDialog != null && mProgressDialog.isShowing()) + mProgressDialog.dismiss(); + appendLogTextAndScroll("Tor background service connected."); // This is called when the connection with the service has been @@ -1208,10 +1210,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic // service through an IDL interface, so get a client-side // representation of that from the raw service object. mService = ITorService.Stub.asInterface(service); - - imgStatus.setEnabled(true); - // We want to monitor the service for as long as we are // connected to it. try { @@ -1233,6 +1232,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } + public void onServiceDisconnected(ComponentName className) { appendLogTextAndScroll("Tor background service disconnected."); diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 1dd39f8..b9f3791 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -83,7 +83,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst public static boolean ENABLE_DEBUG_LOG = false; - private static int currentStatus = STATUS_OFF; + private int mCurrentStatus = STATUS_OFF; private final static int CONTROL_SOCKET_TIMEOUT = 0; @@ -183,7 +183,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { sendCallbackLogMessage (getString(R.string.found_existing_tor_process)); - currentStatus = STATUS_ON; + mCurrentStatus = STATUS_ON; return true; } @@ -217,7 +217,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst public int getTorStatus () { - return currentStatus; + return mCurrentStatus; } @@ -340,12 +340,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - - if (fileTor == null) - initBinariesAndDirectories(); - - updateSettings (); - + initialize(); new Thread (new TorStarter(intent)).start(); return Service.START_STICKY; @@ -386,7 +381,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst //if this is a start on boot launch turn tor on if (mIntent != null && mIntent.getAction()!=null && mIntent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) { - setTorProfile(PROFILE_ON); + setTorProfile(STATUS_ON); } } catch (Exception e) @@ -422,7 +417,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst //stop the foreground priority and make sure to remove the persistant notification stopForeground(true); - currentStatus = STATUS_OFF; + mCurrentStatus = STATUS_OFF; if (mHasRoot && mEnableTransparentProxy) disableTransparentProxy(); @@ -744,7 +739,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void startTor () throws Exception { - currentStatus = STATUS_CONNECTING; + mCurrentStatus = STATUS_CONNECTING; if (fileTor == null) initBinariesAndDirectories(); @@ -1127,7 +1122,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst conn.setConf("Log", "debug file " + fileLog2.getCanonicalPath()); }*/ - currentStatus = STATUS_CONNECTING; + mCurrentStatus = STATUS_CONNECTING; String confSocks = conn.getInfo("net/listeners/socks"); StringTokenizer st = new StringTokenizer(confSocks," "); @@ -1297,7 +1292,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst // get several values - if (currentStatus == STATUS_CONNECTING) + if (mCurrentStatus == STATUS_CONNECTING) { //Map vals = conn.getInfo(Arrays.asList(new String[]{ // "status/bootstrap-phase", "status","version"})); @@ -1317,7 +1312,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst catch (Exception e) { Log.d(TAG, "Unable to get Tor status from control port"); - currentStatus = STATUS_UNAVAILABLE; + mCurrentStatus = STATUS_UNAVAILABLE; } }*/ @@ -1359,16 +1354,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - - - public int getProfile() throws RemoteException { - //return mProfile; - return PROFILE_ON; - } - public void setTorProfile(int profile) { - if (profile == PROFILE_ON) + if (profile == STATUS_ON) { sendCallbackStatusMessage (getString(R.string.status_starting_up)); @@ -1382,7 +1370,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { logException("Unable to start Tor: " + e.toString(),e); - currentStatus = STATUS_OFF; + mCurrentStatus = STATUS_OFF; showToolbarNotification(getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr); stopTor(); } @@ -1393,7 +1381,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst stopTor(); - currentStatus = STATUS_OFF; + mCurrentStatus = STATUS_OFF; } } @@ -1405,7 +1393,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (msg.indexOf(TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE)!=-1) { - currentStatus = STATUS_ON; + mCurrentStatus = STATUS_ON; showToolbarNotification(getString(R.string.status_activated), NOTIFY_ID, R.drawable.ic_stat_tor); } @@ -1550,8 +1538,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst else if(status.equals("BUILT")) { - if (currentStatus == STATUS_CONNECTING) - currentStatus = STATUS_ON; + if (mCurrentStatus == STATUS_CONNECTING) + mCurrentStatus = STATUS_ON; logNotice(sb.toString()); @@ -1679,10 +1667,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst public IBinder onBind(Intent intent) { + logNotice("Background service is bound. Status=" + mCurrentStatus); + return mBinder; } - public boolean checkAndInitImpl () + @Override + public void onRebind(Intent intent) { + + super.onRebind(intent); + } + + public boolean checkAndInitImpl () { if (fileTor != null) { @@ -1693,8 +1689,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst return true; } } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + logException("error init Tor", e); } } @@ -2026,7 +2021,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst mBinder.saveConfiguration(); } - if (currentStatus != STATUS_OFF) + if (mCurrentStatus != STATUS_OFF) { if (!mConnectivity) { diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 19a99c8..a77cdac 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -71,9 +71,6 @@ public interface TorServiceConstants { public final static int STATUS_ON = 1; public final static int STATUS_CONNECTING = 2; - public final static int PROFILE_OFF = -1; - public final static int PROFILE_ON = 1; - public static final int STATUS_MSG = 1; public static final int ENABLE_TOR_MSG = 2; public static final int DISABLE_TOR_MSG = 3;

1 0

[orbot/master] ensure all iptables rules are always wiped
by n8fr8＠torproject.org 07 Sep '14

07 Sep '14

commit b35a239e44cd2f2b5e518cec79ba243edfd8787d Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Sep 7 09:34:48 2014 -0400 ensure all iptables rules are always wiped and reapply rules settings if modifed after settings menu accessed --- src/org/torproject/android/Orbot.java | 8 +++- src/org/torproject/android/service/TorService.java | 42 +++++++++++++++----- 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index d5cd9da..8992826 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -815,8 +815,14 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic e.printStackTrace(); } } - else + else if (torStatus == TorServiceConstants.STATUS_ON) { + try { + mService.processSettings(); + } catch (RemoteException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } Toast.makeText(this, R.string.you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_, Toast.LENGTH_SHORT).show(); } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index b9f3791..ec56ceb 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -897,15 +897,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (mTransProxy == null) mTransProxy = new TorTransProxy(this, fileXtables); - - if (mTransProxyAll) - mTransProxy.setTransparentProxyingAll(this, false); - else - { - ArrayList<TorifiedApp> apps = AppManager.getApps(this, TorServiceUtils.getSharedPrefs(getApplicationContext())); - mTransProxy.setTransparentProxyingByApp(this, apps, false); - } - + + mTransProxy.setTransparentProxyingAll(this, false); + ArrayList<TorifiedApp> apps = AppManager.getApps(this, TorServiceUtils.getSharedPrefs(getApplicationContext())); + mTransProxy.setTransparentProxyingByApp(this, apps, false); + return true; } @@ -1730,7 +1726,31 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void processSettings () { - /* + + try { + + boolean hadEnableTransparentProxy = mEnableTransparentProxy; + + updateSettings (); + + if (mHasRoot) + { + if (hadEnableTransparentProxy) + disableTransparentProxy(); + + if (mEnableTransparentProxy) + { + disableTransparentProxy(); + enableTransparentProxy(); + } + } + + + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + Thread thread = new Thread() { @@ -1750,7 +1770,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst }; thread.start(); - */ + }

1 0

[orbot/master] update to 14.0.8
by n8fr8＠torproject.org 07 Sep '14

07 Sep '14

commit 3d67ce58bb7ee1583545ab00cc7d99d59bdfec1b Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Sep 6 01:03:04 2014 -0400 update to 14.0.8 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c98e643..a09fe5d 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.7.3" - android:versionCode="122" + android:versionName="14.0.8" + android:versionCode="123" android:installLocation="auto" >

1 0