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

[tor-messenger-build/master] Update the branding (first patch)
by sukhbir＠torproject.org 22 Nov '14

22 Nov '14

commit 5624c50c59b19487dad6c1a76de9f46c62f8a19f Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Nov 22 15:40:05 2014 +0530 Update the branding (first patch) --- projects/instantbird/branding.patch | 39 +++++++++++++++++++++++++++++++++++ projects/instantbird/config | 1 + 2 files changed, 40 insertions(+) diff --git a/projects/instantbird/branding.patch b/projects/instantbird/branding.patch new file mode 100644 index 0000000..01ce618 --- /dev/null +++ b/projects/instantbird/branding.patch @@ -0,0 +1,39 @@ +# HG changeset patch +# User Sukhbir Singh <sukhbir(a)torproject.org> +# Date 1416650722 18000 +# Node ID 9d3cc50f1b5c0679d3397154f6c7c329aaf15cf5 +# Parent 84423e51b0535ccd21aff64f10176f3e8c05b7c3 +Update the branding + +diff --git a/im/branding/nightly/locales/en-US/brand.dtd b/im/branding/nightly/locales/en-US/brand.dtd +--- a/im/branding/nightly/locales/en-US/brand.dtd ++++ b/im/branding/nightly/locales/en-US/brand.dtd +@@ -1,10 +1,10 @@ +  + +  + +-<!ENTITY brandShortName "Instantbird"> +-<!ENTITY brandFullName "Instantbird - Nightly"> +-<!ENTITY brandMotto "'Cause geeks can also do magic!"> +-<!ENTITY vendorShortName "Instantbird"> ++<!ENTITY brandShortName "Tor Messenger"> ++<!ENTITY brandFullName "Tor Messenger - Alpha"> ++<!ENTITY brandMotto "Talk over the onion!"> ++<!ENTITY vendorShortName "Tor Messenger"> +diff --git a/im/branding/nightly/locales/en-US/brand.properties b/im/branding/nightly/locales/en-US/brand.properties +--- a/im/branding/nightly/locales/en-US/brand.properties ++++ b/im/branding/nightly/locales/en-US/brand.properties +@@ -1,7 +1,7 @@ + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-brandShortName=Instantbird +-brandFullName=Instantbird - Nightly +-vendorShortName=Instantbird ++brandShortName=Tor Messenger ++brandFullName=Tor Messenger - Alpha ++vendorShortName=Tor Messenger diff --git a/projects/instantbird/config b/projects/instantbird/config index 82cf506..c188103 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -61,6 +61,7 @@ input_files: - filename: accountcreation.patch - filename: links.patch - filename: picture.patch + - filename: branding.patch - filename: prepare-messages-for-displaying.patch - filename: fix-mingw-build.mozpatch enable: '[% c("var/windows") %]'

1 0

[tor-messenger-build/master] Update security preferences
by sukhbir＠torproject.org 22 Nov '14

22 Nov '14

commit c1e33234d4cb7b794e755c171513b68a3603651d Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Nov 22 15:21:53 2014 +0530 Update security preferences - Set strict mode for cert pinning - Disable auto-updates for Instantbird and installed add-ons --- projects/instantbird/preferences.patch | 70 +++++++++++++++++++++++++++++--- 1 file changed, 64 insertions(+), 6 deletions(-) diff --git a/projects/instantbird/preferences.patch b/projects/instantbird/preferences.patch index 06fbf28..b93c079 100644 --- a/projects/instantbird/preferences.patch +++ b/projects/instantbird/preferences.patch @@ -1,8 +1,8 @@ # HG changeset patch # User Sukhbir Singh <sukhbir(a)torproject.org> -# Date 1415700119 18000 -# Node ID 998152b2cc44f677facde77d33cb1fb1af090794 -# Parent 2cc53848b79924aa91e77c961d4682a9cd57bd53 +# Date 1416649788 18000 +# Node ID 84423e51b0535ccd21aff64f10176f3e8c05b7c3 +# Parent ae1c9811a808a4c642d97bf9202cb7bfb866f6b1 Update the security configuration preferences diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js @@ -27,7 +27,32 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. pref("general.smoothScroll", false); #ifdef UNIX_BUT_NOT_MAC -@@ -197,17 +195,17 @@ pref("browser.search.defaultenginename", +@@ -112,24 +110,16 @@ pref("browser.preferences.animateFadeIn" + pref("browser.zoom.full", true); + pref("conversation.zoomLevel", "1.0"); + + pref("accessibility.typeaheadfind", false); + pref("accessibility.typeaheadfind.timeout", 5000); + pref("accessibility.typeaheadfind.linksonly", false); + pref("accessibility.typeaheadfind.flashBar", 1); + +-// Whether or not app updates are enabled +-pref("app.update.enabled", true); +- +-// This preference turns on app.update.mode and allows automatic download and +-// install to take place. We use a separate boolean toggle for this to make +-// the UI easier to construct. +-pref("app.update.auto", true); +- + // Defines how the Application Update Service notifies the user about updates: + // + // AUM Set to: Minor Releases: Major Releases: + // 0 download no prompt download no prompt + // 1 download no prompt download no prompt if no incompatibilities + // 2 download no prompt prompt + // + // See chart in nsUpdateService.js.in for more details +@@ -197,17 +187,17 @@ pref("browser.search.defaultenginename", // disable logging for the search service by default pref("browser.search.log", false); @@ -46,7 +71,28 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. pref("browser.search.updateinterval", 6); /* Extension manager */ -@@ -239,21 +237,16 @@ pref("extensions.webservice.discoverURL" +@@ -217,20 +207,18 @@ pref("xpinstall.dialog.progress.chrome", + pref("xpinstall.dialog.progress.type.skin", "Extension:Manager"); + pref("xpinstall.dialog.progress.type.chrome", "Extension:Manager"); + pref("extensions.dss.enabled", false); + pref("extensions.dss.switchPending", false); + pref("extensions.ignoreMTimeChanges", false); + pref("extensions.logging.enabled", false); + pref("general.skins.selectedSkin", "classic/1.0"); + +-pref("extensions.update.enabled", true); + pref("extensions.update.interval", 86400); + pref("extensions.update.url", "https://addons.instantbird.org/services/update.php?reqVersion=%REQ_VERSION%…"); +-pref("extensions.update.autoUpdateDefault", true); + + // Preferences for the Get Add-ons pane + pref("extensions.getAddons.cache.enabled", false); + pref("extensions.getAddons.browseAddons", "https://addons.instantbird.org/%LOCALE%/%APP%"); + pref("extensions.getAddons.maxResults", 5); + pref("extensions.getAddons.recommended.browseURL", "https://addons.instantbird.org/%LOCALE%/%APP%/recommended"); + pref("extensions.getAddons.recommended.url", "https://services.instantbird.org/%LOCALE%/%APP%/api/%API_VERSION%/list/feat…"); + pref("extensions.getAddons.search.browseURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/search?q=%TERMS%"); +@@ -239,21 +227,16 @@ pref("extensions.webservice.discoverURL" pref("extensions.getMoreExtensionsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/extensions/"); pref("extensions.getMoreThemesURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/themes/"); @@ -68,7 +114,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. pref("network.protocol-handler.expose.http", true); pref("network.protocol-handler.expose.https", true); -@@ -297,19 +290,74 @@ pref("browser.tabs.tabClipWidth", 140); +@@ -297,19 +280,86 @@ pref("browser.tabs.tabClipWidth", 140); // Where to show tab close buttons: // 0 on active tab only @@ -146,3 +192,15 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. +// Media +// Disable "Take Picture" functionality that accesses the webcam +pref("media.navigator.video.enabled", false); ++ ++// Enable cert pinning ++// 2. Strict. Pinning is always enforced ++pref("security.cert_pinning.enforcement_level", 2); ++ ++// Updates ++// Do not auto-update Instantbird ++pref("app.update.enabled", false): ++pref("app.update.auto", false); ++// Do not auto-update extensions ++pref("extensions.update.enabled", false); ++pref("extensions.update.autoUpdateDefault", false);

1 0

[stem/master] Fixing regression from previous DirectoryAuthority change
by atagar＠torproject.org 21 Nov '14

21 Nov '14

commit fde59fcd4e7a02e1cdf55e37e92cac30de7e0af3 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 21 10:09:15 2014 -0800 Fixing regression from previous DirectoryAuthority change Shame on me. What good are tests if you don't run 'em? Traceback (most recent call last): File "./run_tests.py", line 467, in <module> main() File "./run_tests.py", line 216, in main for test_class in test.util.get_unit_tests(args.specific_test): File "/home/atagar/Desktop/stem/test/util.py", line 125, in _get_tests module = __import__(module_name) File "/home/atagar/Desktop/stem/test/unit/descriptor/remote.py", line 10, in <module> import stem.descriptor.remote File "/home/atagar/Desktop/stem/stem/descriptor/remote.py", line 674, in <module> v3ident = 'D586D18309DED4CD6D57C18FDB97EFA96D330566', TypeError: __init__() got an unexpected keyword argument 'is_bandwidth_authority' --- stem/descriptor/remote.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 6a0fb6e..02f09d2 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -654,11 +654,12 @@ class DirectoryAuthority(object): :var str v3ident: identity key fingerprint used to sign votes and consensus """ - def __init__(self, nickname = None, address = None, or_port = None, dir_port = None, fingerprint = None, v3ident = None): + def __init__(self, nickname = None, address = None, or_port = None, dir_port = None, is_bandwidth_authority = False, fingerprint = None, v3ident = None): self.nickname = nickname self.address = address self.or_port = or_port self.dir_port = dir_port + self.is_bandwidth_authority = is_bandwidth_authority self.fingerprint = fingerprint self.v3ident = v3ident

1 0

[webwml/master] Updates brew installation url
by sebastian＠torproject.org 21 Nov '14

21 Nov '14

commit 0a225dc76d9c5f26935dfe1ff549d83eecbec906 Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> Date: Fri Nov 21 19:08:37 2014 +0200 Updates brew installation url --- docs/en/tor-doc-osx.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/tor-doc-osx.wml b/docs/en/tor-doc-osx.wml index 368605d..810b9e7 100644 --- a/docs/en/tor-doc-osx.wml +++ b/docs/en/tor-doc-osx.wml @@ -31,7 +31,7 @@ <p>If you don't have Homebrew installed, open a terminal window and run:</p> - <pre>ruby -e "$(curl -fsSkL https://raw.github.com/Homebrew/homebrew/go/install)"</pre> + <pre>ruby -e "$(curl -fsSkL https://raw.githubusercontent.com/Homebrew/install/master/install)"</pre> <hr> <h2>Step Two: Install Tor</a></h2>

1 0

[stem/master] Noting if authorities are also a bandwidth authority or not
by atagar＠torproject.org 21 Nov '14

21 Nov '14

commit e1308637ab2afe1beabe0a206dd6aea01ed6d781 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 21 09:42:46 2014 -0800 Noting if authorities are also a bandwidth authority or not Anna just pointed out that our example includes... if authority.nickname not in ('moria1', 'gabelmoo', 'maatuska', 'tor26'): continue # not a bandwidth authority This sucks. Not only is it *currently* out of date, but... dude. Hardcoded list. Bad Damian, no biscuit. Including this as part of the DirectoryAuthority object, and using this to back DocTor so it'll stay up to date. https://gitweb.torproject.org/doctor.git/commitdiff/957818d --- docs/change_log.rst | 1 + .../examples/votes_by_bandwidth_authorities.rst | 12 +++++------- stem/descriptor/remote.py | 20 ++++++++++++++++---- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 7fdd2bf..8b9086b 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -57,6 +57,7 @@ The following are only available within Stem's `git repository * Don't fail if consensus method 1 is not present, as it is no longer required (:spec:`fc8a6f0`) * Include '\*.new' files when reading from a Tor data directory (:trac:`13756`) * Updated the authorities we list, `replacing turtles with longclaw <https://lists.torproject.org/pipermail/tor-talk/2014-November/035650.html>`_ and `updating gabelmoo's address <https://lists.torproject.org/pipermail/tor-talk/2014-September/034898.html>`_ + * Noting if authorities are also a bandwidth authority or not * **Utilities** diff --git a/docs/tutorials/examples/votes_by_bandwidth_authorities.rst b/docs/tutorials/examples/votes_by_bandwidth_authorities.rst index f1a4d67..4e7aa00 100644 --- a/docs/tutorials/examples/votes_by_bandwidth_authorities.rst +++ b/docs/tutorials/examples/votes_by_bandwidth_authorities.rst @@ -26,13 +26,11 @@ gets their current votes then prints how many relays it had a measurement for. downloader = remote.DescriptorDownloader() for authority in remote.get_authorities().values(): - if authority.nickname not in ('moria1', 'gabelmoo', 'maatuska', 'tor26'): - continue # not a bandwidth authority - - queries[authority.nickname] = downloader.query( - '/tor/status-vote/current/authority', - endpoints = [(authority.address, authority.dir_port)], - ) + if authority.is_bandwidth_authority: + queries[authority.nickname] = downloader.query( + '/tor/status-vote/current/authority', + endpoints = [(authority.address, authority.dir_port)], + ) for authority_name, query in queries.items(): try: diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index a1d2fb7..6a0fb6e 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -669,6 +669,7 @@ DIRECTORY_AUTHORITIES = { address = '128.31.0.39', or_port = 9101, dir_port = 9131, + is_bandwidth_authority = True, fingerprint = '9695DFC35FFEB861329B9F1AB04C46397020CE31', v3ident = 'D586D18309DED4CD6D57C18FDB97EFA96D330566', ), @@ -677,6 +678,7 @@ DIRECTORY_AUTHORITIES = { address = '86.59.21.38', or_port = 443, dir_port = 80, + is_bandwidth_authority = True, fingerprint = '847B1F850344D7876491A54892F904934E4EB85D', v3ident = '14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4', ), @@ -685,6 +687,7 @@ DIRECTORY_AUTHORITIES = { address = '194.109.206.212', or_port = 443, dir_port = 80, + is_bandwidth_authority = False, fingerprint = '7EA6EAD6FD83083C538F44038BBFA077587DD755', v3ident = 'E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58', ), @@ -693,6 +696,7 @@ DIRECTORY_AUTHORITIES = { address = '82.94.251.203', or_port = 443, dir_port = 80, + is_bandwidth_authority = False, fingerprint = '4A0CCD2DDC7995083D73F5D667100C8A5831F16D', v3ident = None, # does not vote in the consensus ), @@ -701,6 +705,7 @@ DIRECTORY_AUTHORITIES = { address = '131.188.40.189', or_port = 443, dir_port = 80, + is_bandwidth_authority = True, fingerprint = 'F2044413DAC2E02E3D6BCF4735A19BCA1DE97281', v3ident = 'ED03BB616EB2F60BEC80151114BB25CEF515B226', ), @@ -709,6 +714,7 @@ DIRECTORY_AUTHORITIES = { address = '193.23.244.244', or_port = 443, dir_port = 80, + is_bandwidth_authority = False, fingerprint = '7BE683E65D48141321C5ED92F075C55364AC7123', v3ident = '585769C78764D58426B8B52B6651A5A71137189A', ), @@ -717,6 +723,7 @@ DIRECTORY_AUTHORITIES = { address = '208.83.223.34', or_port = 80, dir_port = 443, + is_bandwidth_authority = False, fingerprint = '0AD3FA884D18F89EEA2D89C019379E0E7FD94417', v3ident = '80550987E1D626E3EBA5E5E75A458DE0626D088C', ), @@ -725,6 +732,7 @@ DIRECTORY_AUTHORITIES = { address = '171.25.193.9', or_port = 80, dir_port = 443, + is_bandwidth_authority = True, fingerprint = 'BD6A829255CB08E66FBE7D3748363586E46B3810', v3ident = '49015F787433103580E3B66A1707A00E60F2D15B', ), @@ -733,6 +741,7 @@ DIRECTORY_AUTHORITIES = { address = '154.35.32.5', or_port = 443, dir_port = 80, + is_bandwidth_authority = False, fingerprint = 'CF6D0AAFB385BE71B8E111FC5CFF4B47923733BC', v3ident = 'EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97', ), @@ -741,6 +750,7 @@ DIRECTORY_AUTHORITIES = { address = '199.254.238.52', or_port = 443, dir_port = 80, + is_bandwidth_authority = True, fingerprint = '74A910646BCEEFBCD2E874FC1DC997430F968145', v3ident = '23D15D965BC35114467363C165C4F724B64B4F66', ), @@ -749,10 +759,12 @@ DIRECTORY_AUTHORITIES = { def get_authorities(): """ - Provides the Tor directory authority information as of **Tor commit 00bcc25 - (8/27/13)**. The directory information hardcoded into Tor and occasionally - changes, so the information this provides might not necessarily match your - version of tor. + Provides the Tor directory authority information as of **Tor on 11/21/14**. + The directory information hardcoded into Tor and occasionally changes, so the + information this provides might not necessarily match your version of tor. + + .. versionchanged:: 1.3.0 + Added the is_bandwidth_authority attribute. :returns: dict of str nicknames to :class:`~stem.descriptor.remote.DirectoryAuthority` instances """

1 0

[doctor/master] Using stem to check for bandwidth authorities
by atagar＠torproject.org 21 Nov '14

21 Nov '14

commit 957818d4fe6e44232cd01501cef212e623d2c973 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 21 09:45:05 2014 -0800 Using stem to check for bandwidth authorities Rather than using a hardcoded list in our config fetching this from Stem. That way other people will be able to take advantage of an up-to-date-ish listing of who is and isn't a bandwidth authority. --- consensus_health_checker.py | 7 +++---- data/consensus_health.cfg | 8 -------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index b4be10b..5890c95 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -34,7 +34,6 @@ EMAIL_SUBJECT = 'Consensus issues' CONFIG = stem.util.conf.config_dict('consensus_health', { 'msg': {}, 'suppression': {}, - 'bandwidth_authorities': [], 'known_params': [], 'contact_address': {}, 'contact_via_bcc': [], @@ -539,9 +538,9 @@ def voting_bandwidth_scanners(latest_consensus, consensuses, votes): contains_measured_bandwidth = True break - if authority in CONFIG['bandwidth_authorities'] and not contains_measured_bandwidth: + if authority.is_bandwidth_authority and not contains_measured_bandwidth: missing_authorities.append(authority) - if authority not in CONFIG['bandwidth_authorities'] and contains_measured_bandwidth: + if not authority.is_bandwidth_authority and contains_measured_bandwidth: extra_authorities.append(authority) issues = [] @@ -563,7 +562,7 @@ def unmeasured_relays(latest_consensus, consensuses, votes): consensus_fingerprints = set([desc.fingerprint for desc in latest_consensus.routers.values()]) for authority, vote in votes.items(): - if authority in CONFIG['bandwidth_authorities']: + if authority.is_bandwidth_authority: measured, unmeasured = 0, 0 for desc in vote.routers.values(): diff --git a/data/consensus_health.cfg b/data/consensus_health.cfg index c417287..7e30fd0 100644 --- a/data/consensus_health.cfg +++ b/data/consensus_health.cfg @@ -26,14 +26,6 @@ suppression MISSING_AUTHORITIES => 24 # 1 day suppression TOR_OUT_OF_DATE => 24 # 1 day suppression AUTHORITY_UNAVAILABLE => 24 # 1 day -# directory authorities that run bandwidth scanners - -bandwidth_authorities moria1 -bandwidth_authorities gabelmoo -bandwidth_authorities maatuska -bandwidth_authorities tor26 -bandwidth_authorities longclaw - # recognized tor consensus parameters known_params bwweightscale

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 21 Nov '14

21 Nov '14

commit a741e8217664f3f931a04342859279d2b197b428 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 21 17:15:49 2014 +0000 Update translations for torbutton-torbuttondtd --- sq/torbutton.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sq/torbutton.dtd b/sq/torbutton.dtd index 7ce2294..7f3ef0b 100644 --- a/sq/torbutton.dtd +++ b/sq/torbutton.dtd @@ -150,8 +150,8 @@ <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> <!ENTITY torbutton.prefs.sec_caption "Niveli i sigurisë"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_low "E ulët (standarde)"> +<!ENTITY torbutton.prefs.sec_med_low "Mesatare-E ulët"> +<!ENTITY torbutton.prefs.sec_med_high "Mesatare-E lartë"> +<!ENTITY torbutton.prefs.sec_high "E lartë"> +<!ENTITY torbutton.prefs.sec_custom "Vlera personale">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 21 Nov '14

21 Nov '14

commit 3008962d7a380e58ebf7bce8140fc11161a4696d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 21 17:15:46 2014 +0000 Update translations for torbutton-torbuttonproperties --- sq/torbutton.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sq/torbutton.properties b/sq/torbutton.properties index 49fcd73..b4b06c7 100644 --- a/sq/torbutton.properties +++ b/sq/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use To torbutton.prefs.recommended = (recommended) torbutton.prefs.optional = (optional) torbutton.prefs.crucial = (crucial) -torbutton.popup.external.title = Download an external file type? +torbutton.popup.external.title = Dëshironi të shkarkoni një tip skedari të jashtëm? torbutton.popup.external.app = Browseri Tor nuk mundet te shfaqi kete dokument.Ju duhet ta hapni ate me nje aplikacion tjeter.\n torbutton.popup.external.note = Disa tipe dokumantash mund te shkaktojne qe disa aplikacione te lidhen me internetin pa perdorur Tor-in.\n -torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n +torbutton.popup.external.suggest = Për të qenë të sigurt, ju duhet ti hapni skedarët e shkarkuar vetëm kur të jeni të shkëputur nga interneti, ose përdorni një Tor Live CD si psh Tails.\n torbutton.popup.launch = Shkarko dokumentin\n\n\n\n torbutton.popup.cancel = Anullo -torbutton.popup.dontask = Automatically download files from now on +torbutton.popup.dontask = Shkarkoji automatikisht skedarët tani e tutje torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.captcha.title = Avoid Google Captchas? torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query? @@ -48,10 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Never ask me again # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now +canvas.siteprompt=Kjo faqe (%S) po mundohet të nxjerrë të dhëna imazhi HTML5, të cilat mund të përdoren për të identifikuar kompjuterin tuaj në mënyrë unikale.\n\nMund ta lejojë Shfletuesi Tor këtë faqe të nxjerrë të dhënat e imazheve HTML5? +canvas.notNow=Jo tani canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.allow=Lejo në të ardhmen canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) +canvas.never=Kurrë për këtë faqe (e rekomanduar) canvas.neverAccessKey=e

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 21 Nov '14

21 Nov '14

commit 7c3f9d55704a8500b9724736d24778b78080411b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 21 16:45:46 2014 +0000 Update translations for torbutton-torbuttondtd --- sq/torbutton.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sq/torbutton.dtd b/sq/torbutton.dtd index e562328..7ce2294 100644 --- a/sq/torbutton.dtd +++ b/sq/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "Parametrat e Fshehtësisë dhe Sigurisë"> <!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> <!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> <!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> @@ -144,12 +144,12 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries"> <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> -<!ENTITY torbutton.prefs.priv_caption "Privacy Settings"> +<!ENTITY torbutton.prefs.priv_caption "Parametrat e fshehtësisë"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> +<!ENTITY torbutton.prefs.sec_caption "Niveli i sigurisë"> <!ENTITY torbutton.prefs.sec_low "Low (default)"> <!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> <!ENTITY torbutton.prefs.sec_med_high "Medium-High">

1 0

[orbot/master] improves in start/stop logic for background service
by n8fr8＠torproject.org 21 Nov '14

21 Nov '14

commit cf218090520fd8ebb362c78814592b75b9857015 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 17 23:28:33 2014 -0500 improves in start/stop logic for background service --- src/org/torproject/android/Orbot.java | 31 +++-- src/org/torproject/android/service/TorService.java | 120 ++++++++++---------- .../android/service/TorServiceConstants.java | 11 ++ .../android/service/TorServiceUtils.java | 2 +- 4 files changed, 92 insertions(+), 72 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index d8e1f6b..d1c111a 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -106,7 +106,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic LocalBroadcastManager.getInstance(this).registerReceiver(mMessageReceiver, new IntentFilter("log")); - startService("init"); + startService(TorServiceConstants.CMD_INIT); } // Our handler for received Intents. This will be called whenever an Intent @@ -154,7 +154,14 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic torService.setAction(action); startService(torService); - + } + + private void stopService () + { + + Intent torService = new Intent(this, TorService.class); + stopService(torService); + } private void doLayout () @@ -412,7 +419,9 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic { if (mItemOnOff != null) mItemOnOff.setTitle(R.string.menu_start); + stopTor(); + stopService (); } @@ -472,7 +481,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic //not something to tackle in your first iteration, but i thin we can talk about fixing //terminology but also making sure there are clear distinctions in control stopTor(); - + stopService (); //onDestroy(); @@ -855,7 +864,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } else if (request == REQUEST_VPN && response == RESULT_OK) { - startService("vpn"); + startService(TorServiceConstants.CMD_VPN); } } @@ -871,21 +880,21 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } else { - startService("vpn"); + startService(TorServiceConstants.CMD_VPN); } } private boolean flushTransProxy () { - startService("flush"); + startService(TorServiceConstants.CMD_FLUSH); return true; } private boolean updateSettings () { //todo send service command - startService("update"); + startService(TorServiceConstants.CMD_UPDATE); return true; } @@ -1022,7 +1031,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic { - startService ("start"); + startService (TorServiceConstants.CMD_START); torStatus = TorServiceConstants.STATUS_CONNECTING; mTxtOrbotLog.setText(""); @@ -1050,7 +1059,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic private void stopTor () throws RemoteException { - startService ("stop"); + startService (TorServiceConstants.CMD_STOP); torStatus = TorServiceConstants.STATUS_OFF; // mService.setProfile(TorServiceConstants.STATUS_OFF); @@ -1058,6 +1067,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic mHandler.sendMessage(msg); + } /* @@ -1080,6 +1090,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic { stopTor(); + stopService (); } @@ -1303,7 +1314,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic public void spinOrbot (float direction) { - startService ("newnym"); + startService (TorServiceConstants.CMD_NEWNYM); //mService.newIdentity(); //request a new identity //TODO trigger newnym diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index aeca556..adb6fcf 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -377,31 +377,31 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (action!=null) { - if(action.equals(Intent.ACTION_BOOT_COMPLETED)||action.equals("start")) + if(action.equals(Intent.ACTION_BOOT_COMPLETED)||action.equals(CMD_START)) { setTorProfile(STATUS_ON); } - else if (action.equals("stop")) + else if (action.equals(CMD_STOP)) { setTorProfile(STATUS_OFF); } - else if (action.equals("init")) + else if (action.equals(CMD_INIT)) { sendCallbackStatus(mCurrentStatus); } - else if (action.equals("newnym")) + else if (action.equals(CMD_NEWNYM)) { newIdentity(); } - else if (action.equals("flush")) + else if (action.equals(CMD_FLUSH)) { flushTransparentProxyRules(); } - else if (action.equals("update")) + else if (action.equals(CMD_UPDATE)) { processSettings(); } - else if (action.equals("vpn")) + else if (action.equals(CMD_VPN)) { startVpnService(); } @@ -774,7 +774,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - public void startTor () throws Exception + private void startTor () throws Exception { mCurrentStatus = STATUS_CONNECTING; @@ -1074,6 +1074,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst int attempt = 0; + + logNotice( "Waiting for control port..."); + while (conn == null && attempt++ < maxTries) { try @@ -1098,13 +1101,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst catch (Exception ce) { conn = null; - logException( "Error connecting to Tor local control port: " + ce.getMessage(),ce); + // logException( "Error connecting to Tor local control port: " + ce.getMessage(),ce); } try { - logNotice("waiting..."); + // logNotice("waiting..."); Thread.sleep(1000); } catch (Exception e){} @@ -1264,7 +1267,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { if (fileControlPort.exists()) { - logNotice("Reading control port config file: " + fileControlPort.getCanonicalPath()); + debug("Reading control port config file: " + fileControlPort.getCanonicalPath()); BufferedReader bufferedReader = new BufferedReader(new FileReader(fileControlPort)); String line = bufferedReader.readLine(); @@ -1284,7 +1287,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } else { - logNotice("Control Port config file does not yet exist (waiting for tor): " + fileControlPort.getCanonicalPath()); + debug("Control Port config file does not yet exist (waiting for tor): " + fileControlPort.getCanonicalPath()); } @@ -1292,11 +1295,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (FileNotFoundException e) { - logNotice("unable to get control port; file not found"); + debug("unable to get control port; file not found"); } catch (Exception e) { - logNotice("unable to read control port config file"); + debug("unable to read control port config file"); } return result; @@ -1376,37 +1379,53 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - public void setTorProfile(int profile) { + public void setTorProfile(int newState) { - if (profile == STATUS_ON && mCurrentStatus != STATUS_ON) + if (newState == STATUS_ON) { - sendCallbackLogMessage (getString(R.string.status_starting_up)); - - try - { - startTor(); - - } - catch (Exception e) - { - - logException("Unable to start Tor: " + e.toString(),e); - mCurrentStatus = STATUS_OFF; - sendCallbackStatus(mCurrentStatus); - - showToolbarNotification(getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr); - stopTor(); - } + if (mCurrentStatus == STATUS_OFF) + { + sendCallbackLogMessage (getString(R.string.status_starting_up)); + + + try + { + + boolean found = findExistingProc (); + + if (!found) + { + killProcess(fileTor); + killProcess(filePolipo); + + startTor(); + } + } + catch (Exception e) + { + + logException("Unable to start Tor: " + e.toString(),e); + mCurrentStatus = STATUS_OFF; + sendCallbackStatus(mCurrentStatus); + + showToolbarNotification(getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + stopTor(); + } + + } } - else if (profile == STATUS_OFF && mCurrentStatus != STATUS_OFF) + else if (newState == STATUS_OFF) { - sendCallbackLogMessage (getString(R.string.status_shutting_down)); - - stopTor(); - - mCurrentStatus = STATUS_OFF; - sendCallbackStatus(mCurrentStatus); + if (mCurrentStatus == STATUS_ON) + { + sendCallbackLogMessage (getString(R.string.status_shutting_down)); + + stopTor(); + + mCurrentStatus = STATUS_OFF; + sendCallbackStatus(mCurrentStatus); + } } } @@ -1733,27 +1752,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - - public boolean checkAndInitImpl () - { - if (fileTor != null) - { - try { - if (TorServiceUtils.findProcessId(fileTor.getCanonicalPath()) != -1) - { - initialize(); - return true; - } - } catch (IOException e) { - logException("error init Tor", e); - } - - } - - return false; - } - - public void processSettings () { diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 0b64856..d979ac4 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -76,6 +76,17 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; + public static final String CMD_START = "start"; + public static final String CMD_STOP = "stop"; + public static final String CMD_FLUSH = "flush"; + public static final String CMD_NEWNYM = "newnym"; + public static final String CMD_INIT = "init"; + public static final String CMD_VPN = "vpn"; + public static final String CMD_UPDATE = "update"; + + + + public static final String BINARY_TOR_VERSION = "0.2.5.10-openssl1.0.1i-nonPIE-polipofix"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index 0038a5c..a22b328 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -108,7 +108,7 @@ public class TorServiceUtils implements TorServiceConstants { } } - procPs.destroy(); + try { procPs.destroy(); } catch (Exception e) {} // try to destroy just to make sure we clean it up return procId;

1 0