February 2021 - tor-commits - lists.torproject.org

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 10 Feb '21

10 Feb '21

commit d8244a5a9418d98a46967eef54b2371630a90396 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 10 04:15:55 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- hy.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hy.po b/hy.po index 3b7d6353a9..4df39065bb 100644 --- a/hy.po +++ b/hy.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-02-05 23:41+0000\n" +"PO-Revision-Date: 2021-02-10 04:04+0000\n" "Last-Translator: At protom <atprotom(a)gmail.com>\n" "Language-Team: Armenian (http://www.transifex.com/otf/torproject/language/hy/)\n" "MIME-Version: 1.0\n" @@ -117,7 +117,7 @@ msgstr "" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:268 msgid "Error while updating the signing key" -msgstr "" +msgstr "Բանալու ստորագրման թարմացման ժամանակ սխալ" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:295 msgid "Error while checking for upgrades" @@ -1532,7 +1532,7 @@ msgstr "Հաստատել" #: config/chroot_local-includes/usr/local/bin/tails-security-check:121 msgid "This version of Tails has known security issues:" -msgstr "" +msgstr "Tails-ի այս տարբերակն ունի հայտնի անվտանգության խնդիրներ." #: config/chroot_local-includes/usr/local/bin/tails-security-check:132 msgid "Known security issues"

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 10 Feb '21

10 Feb '21

commit bfd077a0090c5623c1eea447bde9461d2f8f6378 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 10 04:15:52 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- hy_AM/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hy_AM/messages.json b/hy_AM/messages.json index d750e9a981..e2c4d4f545 100644 --- a/hy_AM/messages.json +++ b/hy_AM/messages.json @@ -33,7 +33,7 @@ "message": "Փորձվում է կրկին..." }, "badgeCookiesOff": { - "message": "Cookies are not enabled." + "message": "«Cookie»-ները չեն կարողազրկվել:" }, "websiteIntro": { "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">documentation wiki</a>."

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 10 Feb '21

10 Feb '21

commit 43fa5ec8bd1bff012f860a217eb474165811ab85 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 10 04:15:25 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- hy/https-everywhere.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hy/https-everywhere.dtd b/hy/https-everywhere.dtd index 4d47aecd7f..e65d551374 100644 --- a/hy/https-everywhere.dtd +++ b/hy/https-everywhere.dtd @@ -14,7 +14,7 @@ <!ENTITY https-everywhere.menu.httpNoWhereExplainedBlocked "Unencrypted requests are currently blocked"> <!ENTITY https-everywhere.menu.httpNoWhereExplainedAllowed "Unencrypted requests are currently allowed"> <!ENTITY https-everywhere.menu.seeMore "Տեսնել ավելին"> -<!ENTITY https-everywhere.menu.seeLess "See less"> +<!ENTITY https-everywhere.menu.seeLess "Տեսնել պակաս"> <!ENTITY https-everywhere.menu.httpNoWhereMore "This mode blocks unencrypted content and requests"> <!ENTITY https-everywhere.menu.showCounter "Ցուցադրել հաշվիչը"> <!ENTITY https-everywhere.menu.viewAllRules "Դիտել բոլոր կանոնները"> @@ -22,7 +22,7 @@ <!ENTITY https-everywhere.options.settings "Կարգավորումներ"> <!ENTITY https-everywhere.options.generalSettings "Հիմնական կարգավորումներ"> <!ENTITY https-everywhere.options.advancedSettings "Ընդլայնված կարգավորումներ"> -<!ENTITY https-everywhere.options.updateChannels "Update Channels"> +<!ENTITY https-everywhere.options.updateChannels "Թարմացման ալիքներ"> <!ENTITY https-everywhere.options.enableMixedRulesets "Enable mixed content rulesets"> <!ENTITY https-everywhere.options.showDevtoolsTab "Show Devtools tab"> <!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-update rulesets"> @@ -32,8 +32,8 @@ <!ENTITY https-everywhere.options.addDisabledSite "Ավելացնել կարողազրկված կայք"> <!ENTITY https-everywhere.options.enterDisabledSite "Մուտքագրեք կարողազրկված կայքը"> <!ENTITY https-everywhere.options.hostNotFormattedCorrectly "This host could not be added because it was not formatted correctly. Please check it and try again."> -<!ENTITY https-everywhere.options.addUpdateChannel "Add Update Channel"> -<!ENTITY https-everywhere.options.enterUpdateChannelName "Enter update channel name"> +<!ENTITY https-everywhere.options.addUpdateChannel "Ավելացնել թարմացման ալիք"> +<!ENTITY https-everywhere.options.enterUpdateChannelName "Մուտքագրեք թարմացման ալիքի անունը"> <!ENTITY https-everywhere.options.delete "Ջնջել"> <!ENTITY https-everywhere.options.update "Թարմացնել"> <!ENTITY https-everywhere.options.storedRulesetsVersion "Stored rulesets version: "> @@ -41,7 +41,7 @@ <!ENTITY https-everywhere.options.updatesLastCheckedNever "երբեք"> <!ENTITY https-everywhere.options.debuggingRulesets "Debugging Rulesets (advanced)"> -<!ENTITY https-everywhere.prefs.export_settings "Export Settings"> +<!ENTITY https-everywhere.prefs.export_settings "Արտահանել կարգավորումները"> <!ENTITY https-everywhere.prefs.reset_defaults "Ետ բերել լռելյայնները"> <!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?">

1 0

[stem/master] Now validate Tor v3 address checksum in hidden service address validator
by atagar＠torproject.org 10 Feb '21

10 Feb '21

commit 434638a828201c286e5fef158761dc2c4c67e47d Author: Kevin Froman <beardog(a)mailbox.org> Date: Fri Feb 5 23:31:32 2021 +0000 Now validate Tor v3 address checksum in hidden service address validator --- stem/util/tor_tools.py | 19 ++++++++++++++++ test/unit/util/tor_tools.py | 55 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/stem/util/tor_tools.py b/stem/util/tor_tools.py index e2df4312..c9a04e33 100644 --- a/stem/util/tor_tools.py +++ b/stem/util/tor_tools.py @@ -20,6 +20,8 @@ Miscellaneous utility functions for working with tor. """ import re +from base64 import b32decode +from hashlib import sha3_256 import stem.util.str_tools @@ -45,6 +47,7 @@ CIRC_ID_PATTERN = re.compile('^[a-zA-Z0-9]{1,16}$') HS_V2_ADDRESS_PATTERN = re.compile('^[a-z2-7]{16}$') HS_V3_ADDRESS_PATTERN = re.compile('^[a-z2-7]{56}$') +HS_V3_CHECKSUM_CONSTANT = ".onion checksum" def is_valid_fingerprint(entry: str, check_prefix: bool = False) -> bool: @@ -153,6 +156,14 @@ def is_valid_hidden_service_address(entry: str, version: Optional[Union[int, Seq otherwise """ + def _extract_v3_parts(address): + decoded = b32decode(address.upper()) + return (decoded[:32], decoded[32:34]) + + v3_pubkey = None + v3_checksum = None + v3_version = int(3).to_bytes(1, 'little') + if isinstance(entry, bytes): entry = stem.util.str_tools._to_unicode(entry) @@ -168,6 +179,14 @@ def is_valid_hidden_service_address(entry: str, version: Optional[Union[int, Seq return True if 3 in version and bool(HS_V3_ADDRESS_PATTERN.match(entry)): + # v3+ onions have a consistent version at end of address + if not entry.endswith('d'): + return False + # Test that the checksum (part of every v3 address) is valid + v3_pubkey, v3_checksum = _extract_v3_parts(entry) + expected_checksum = sha3_256(HS_V3_CHECKSUM_CONSTANT.encode('utf-8') + v3_pubkey + v3_version).digest()[:2] + if expected_checksum != v3_checksum: + return False return True return False diff --git a/test/unit/util/tor_tools.py b/test/unit/util/tor_tools.py index 5035d7b4..285b4dde 100644 --- a/test/unit/util/tor_tools.py +++ b/test/unit/util/tor_tools.py @@ -3,12 +3,67 @@ Unit tests for the stem.util.tor_tools functions. """ import unittest +import os import stem.util.str_tools import stem.util.tor_tools class TestTorTools(unittest.TestCase): + + def test_is_valid_hidden_service_address(self): + """ + Check hidden service addresses are valid (no .onion) + """ + valid_v2_addresses = [ + 'facebookcorewwwi', + 'aaaaaaaaaaaaaaaa', + ] + invalid_v2_addresses = [ + 'facebookcorewww', + 'facebookcorewwyi' + 'facebookc0rewwwi', + 'facebookcorew wi', + None, + 0, + 1, + -1, + os.urandom(8) + ] + + for address in valid_v2_addresses: + self.assertTrue(stem.util.tor_tools.is_valid_hidden_service_address(address)) + self.assertTrue(stem.util.tor_tools.is_valid_hidden_service_address(address, version=2)) + + for address in invalid_v2_addresses: + self.assertFalse(stem.util.tor_tools.is_valid_hidden_service_address(address)) + self.assertFalse(stem.util.tor_tools.is_valid_hidden_service_address(address, version=2)) + + # Test version 3 addresses + valid_v3_addresses = [ + 'pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd', + 'sp3k262uwy4r2k3ycr5awluarykdpag6a7y33jxop4cs2lu5uz5sseqd', + 'xa4r2iadxm55fbnqgwwi5mymqdcofiu3w6rpbtqn7b2dyn7mgwj64jyd' + ] + invalid_v3_addresses = [ + 'pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryc', # bad version + 'xa4r2iadxm55fbnqgwwi5mymqdcofiu3w6rpbtqn7b2dyn7mgwj64jy', # too short + 'sp3k262uwy4r2k4ycr5awluarykdpag6a7y33jxop4cs2lu5uz5sseqd', # checksum mismatch + 'pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscrybd', # too long + None, + 0, + 1, + -1, + os.urandom(56) + ] + + for address in valid_v3_addresses: + self.assertTrue(stem.util.tor_tools.is_valid_hidden_service_address(address)) + self.assertTrue(stem.util.tor_tools.is_valid_hidden_service_address(address, version=3)) + for address in invalid_v3_addresses: + self.assertFalse(stem.util.tor_tools.is_valid_hidden_service_address(address)) + self.assertFalse(stem.util.tor_tools.is_valid_hidden_service_address(address, version=3)) + def test_is_valid_fingerprint(self): """ Checks the is_valid_fingerprint function.

1 0

[stem/master] Adjust extended v3 HS address validation
by atagar＠torproject.org 10 Feb '21

10 Feb '21

commit 63a476056017dda5ede35efc4e4f7acfcc1d7d1a Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Feb 9 16:12:36 2021 -0800 Adjust extended v3 HS address validation Mostly minor stylistic adjustments. The only functional bit is correcting a unit test failure... ====================================================================== FAIL: test_identity_key_from_address ---------------------------------------------------------------------- ValueError: '55555555555555555555555555555555555555555555555555555555.onion' isn't a valid hidden service v3 address During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/unit/descriptor/hidden_service_v3.py", line 220, in test_identity_key_from_address self.assertRaisesWith(ValueError, 'Bad checksum (expected def7 but was 842e)', HiddenServiceDescriptorV3.identity_key_from_address, '5' * 56) File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 249, in assertRaisesWith return self.assertRaisesRegexp(exc_type, '^%s$' % re.escape(exc_msg), *args, **kwargs) AssertionError: "^Bad\ checksum\ $expected\ def7\ but\ was\ 842e$$" does not match "'55555555555555555555555555555555555555555555555555555555.onion' isn't a valid hidden service v3 address" ---------------------------------------------------------------------- --- stem/descriptor/hidden_service.py | 2 +- stem/util/tor_tools.py | 35 +++++++++++++---------------- test/unit/util/tor_tools.py | 46 ++++++++++++++++++--------------------- 3 files changed, 37 insertions(+), 46 deletions(-) diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index 63f107e7..249c2153 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -1129,7 +1129,7 @@ class HiddenServiceDescriptorV3(HiddenServiceDescriptor): if onion_address.endswith('.onion'): onion_address = onion_address[:-6] - if not stem.util.tor_tools.is_valid_hidden_service_address(onion_address, version = 3): + if not stem.util.tor_tools.HS_V3_ADDRESS_PATTERN.match(onion_address): raise ValueError("'%s.onion' isn't a valid hidden service v3 address" % onion_address) # onion_address = base32(PUBKEY | CHECKSUM | VERSION) + '.onion' diff --git a/stem/util/tor_tools.py b/stem/util/tor_tools.py index c9a04e33..e758b897 100644 --- a/stem/util/tor_tools.py +++ b/stem/util/tor_tools.py @@ -19,9 +19,9 @@ Miscellaneous utility functions for working with tor. is_hex_digits - checks if a string is only made up of hex digits """ +import base64 +import hashlib import re -from base64 import b32decode -from hashlib import sha3_256 import stem.util.str_tools @@ -47,7 +47,6 @@ CIRC_ID_PATTERN = re.compile('^[a-zA-Z0-9]{1,16}$') HS_V2_ADDRESS_PATTERN = re.compile('^[a-z2-7]{16}$') HS_V3_ADDRESS_PATTERN = re.compile('^[a-z2-7]{56}$') -HS_V3_CHECKSUM_CONSTANT = ".onion checksum" def is_valid_fingerprint(entry: str, check_prefix: bool = False) -> bool: @@ -156,14 +155,6 @@ def is_valid_hidden_service_address(entry: str, version: Optional[Union[int, Seq otherwise """ - def _extract_v3_parts(address): - decoded = b32decode(address.upper()) - return (decoded[:32], decoded[32:34]) - - v3_pubkey = None - v3_checksum = None - v3_version = int(3).to_bytes(1, 'little') - if isinstance(entry, bytes): entry = stem.util.str_tools._to_unicode(entry) @@ -179,15 +170,19 @@ def is_valid_hidden_service_address(entry: str, version: Optional[Union[int, Seq return True if 3 in version and bool(HS_V3_ADDRESS_PATTERN.match(entry)): - # v3+ onions have a consistent version at end of address - if not entry.endswith('d'): - return False - # Test that the checksum (part of every v3 address) is valid - v3_pubkey, v3_checksum = _extract_v3_parts(entry) - expected_checksum = sha3_256(HS_V3_CHECKSUM_CONSTANT.encode('utf-8') + v3_pubkey + v3_version).digest()[:2] - if expected_checksum != v3_checksum: - return False - return True + # onion_address = base32(PUBKEY | CHECKSUM | VERSION) + ".onion" + + decoded = base64.b32decode(entry.upper()) + pubkey, checksum, addr_version = decoded[:32], decoded[32:34], decoded[34:] + + if addr_version != b'\x03': + return False # VERSION component must be three + + # CHECKSUM = H(".onion checksum" | PUBKEY | VERSION)[:2] + + expected_checksum = hashlib.sha3_256(b'.onion checksum' + pubkey + addr_version).digest()[:2] + + return checksum == expected_checksum return False except TypeError: diff --git a/test/unit/util/tor_tools.py b/test/unit/util/tor_tools.py index 285b4dde..06707390 100644 --- a/test/unit/util/tor_tools.py +++ b/test/unit/util/tor_tools.py @@ -3,66 +3,62 @@ Unit tests for the stem.util.tor_tools functions. """ import unittest -import os import stem.util.str_tools import stem.util.tor_tools class TestTorTools(unittest.TestCase): - - def test_is_valid_hidden_service_address(self): + def test_is_valid_hidden_service_address_v2(self): """ - Check hidden service addresses are valid (no .onion) + Checks the is_valid_hidden_service_address for v2 addresses. """ + valid_v2_addresses = [ 'facebookcorewwwi', 'aaaaaaaaaaaaaaaa', ] + invalid_v2_addresses = [ 'facebookcorewww', 'facebookcorewwyi' 'facebookc0rewwwi', 'facebookcorew wi', - None, - 0, - 1, - -1, - os.urandom(8) ] for address in valid_v2_addresses: self.assertTrue(stem.util.tor_tools.is_valid_hidden_service_address(address)) - self.assertTrue(stem.util.tor_tools.is_valid_hidden_service_address(address, version=2)) + self.assertTrue(stem.util.tor_tools.is_valid_hidden_service_address(address, version = 2)) for address in invalid_v2_addresses: self.assertFalse(stem.util.tor_tools.is_valid_hidden_service_address(address)) - self.assertFalse(stem.util.tor_tools.is_valid_hidden_service_address(address, version=2)) + self.assertFalse(stem.util.tor_tools.is_valid_hidden_service_address(address, version = 2)) + + def test_is_valid_hidden_service_address_v3(self): + """ + Checks the is_valid_hidden_service_address for v3 addresses. + """ - # Test version 3 addresses valid_v3_addresses = [ 'pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd', 'sp3k262uwy4r2k3ycr5awluarykdpag6a7y33jxop4cs2lu5uz5sseqd', - 'xa4r2iadxm55fbnqgwwi5mymqdcofiu3w6rpbtqn7b2dyn7mgwj64jyd' - ] + 'xa4r2iadxm55fbnqgwwi5mymqdcofiu3w6rpbtqn7b2dyn7mgwj64jyd', + ] + invalid_v3_addresses = [ - 'pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryc', # bad version - 'xa4r2iadxm55fbnqgwwi5mymqdcofiu3w6rpbtqn7b2dyn7mgwj64jy', # too short - 'sp3k262uwy4r2k4ycr5awluarykdpag6a7y33jxop4cs2lu5uz5sseqd', # checksum mismatch - 'pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscrybd', # too long - None, - 0, - 1, - -1, - os.urandom(56) + 'pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryc', # bad version + 'xa4r2iadxm55fbnqgwwi5mymqdcofiu3w6rpbtqn7b2dyn7mgwj64jy', # too short + 'sp3k262uwy4r2k4ycr5awluarykdpag6a7y33jxop4cs2lu5uz5sseqd', # checksum mismatch + 'pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscrybd', # too long ] for address in valid_v3_addresses: self.assertTrue(stem.util.tor_tools.is_valid_hidden_service_address(address)) - self.assertTrue(stem.util.tor_tools.is_valid_hidden_service_address(address, version=3)) + self.assertTrue(stem.util.tor_tools.is_valid_hidden_service_address(address, version = 3)) + for address in invalid_v3_addresses: self.assertFalse(stem.util.tor_tools.is_valid_hidden_service_address(address)) - self.assertFalse(stem.util.tor_tools.is_valid_hidden_service_address(address, version=3)) + self.assertFalse(stem.util.tor_tools.is_valid_hidden_service_address(address, version = 3)) def test_is_valid_fingerprint(self): """

1 0

[tor-browser/tor-browser-78.7.1esr-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 10 Feb '21

10 Feb '21

commit 46d47c8f0cb0872f56ddb1abeac4b33e580cadc1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Feb 10 00:07:03 2021 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 28abe803ac50..edad4c65724f 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 28abe803ac506b792269568fe02a3813157de8ef +Subproject commit edad4c65724fecfcacec5afd7e8c394f850d9f1d

1 0

[torbutton/master] Bug 40026: Add feedback survey banner
by sysrqb＠torproject.org 10 Feb '21

10 Feb '21

commit edad4c65724fecfcacec5afd7e8c394f850d9f1d Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Feb 8 21:58:13 2021 +0000 Bug 40026: Add feedback survey banner --- chrome/content/aboutTor/aboutTor.xhtml | 11 ++++++++ chrome/skin/aboutTor.css | 47 ++++++++++++++++++++++++++++++++++ chrome/skin/tor-survey-icon.svg | 1 + 3 files changed, 59 insertions(+) diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index 6c712a67..0eca9976 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -65,6 +65,17 @@ </form> </div> + <div id="surveyBanner"> + <img id="surveyImg" src="resource://torbutton-assets/tor-survey-icon.svg" /> + <div id="surveyTextCol"> + <div id="surveyHeader">We’d love to get your feedback</div> + <br /> + <div id="surveyDescription">We put our users at the center of our development process. You can help us improve Tor Browser by completing this short survey about your experience:</div> + <br /> + <a id="surveyLink" target="_blank" href="https://survey.torproject.org/index.php/217469">Launch the Survey</a> + </div> + </div> + <div id="bottom"> <p id="donate" class="moreInfoLink">&aboutTor.donationBanner.freeToUse; <a href="https://donate.torproject.org/">&aboutTor.donationBanner.buttonA; »</a> diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index 8d5c4a83..d53e4060 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -212,6 +212,53 @@ body:not([showmanual]) .showForManual { background-color: rgba(12, 12, 13, 0.1); /* same as Firefox's about:home */ } +#surveyBanner { + width: 690px; + padding: 20px 25px 25px; + background: rgba(0, 0, 0, 0.3); + border-radius: 6px; + margin: 35px auto 0px; + display: flex; + flex-direction: row; + align-items: flex-start; + position: static; +} + +@media only screen and (min-width: 900px) { + #surveyBanner { + margin: 35px 0px 0px 135px; + } +} + +#surveyTextCol { + padding: 8px 0px 0px 15px; + font-size: 15px; + line-height: normal; + color: #FFFFFF; + width: 633px; +} + +#surveyHeader { + font-weight: bold; +} + +#surveyImg { + width: 32px; + position: static; +} + +div.surveyDescription, div.surveyLink { + padding-top: 10px; +} + +a#surveyLink { + text-decoration: underline; +} + +a#surveyLink:hover { + text-decoration: none; +} + /* #search-text is the search input field */ #search-text { flex: 1; diff --git a/chrome/skin/tor-survey-icon.svg b/chrome/skin/tor-survey-icon.svg new file mode 100644 index 00000000..6e1eca1a --- /dev/null +++ b/chrome/skin/tor-survey-icon.svg @@ -0,0 +1 @@ +<svg fill="none" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg"><rect fill="#df58a9" height="32" rx="16" width="32"/><g fill="#240a3b"><path clip-rule="evenodd" d="m16.3397 25c-4.9708 0-8.99998-4.0295-8.99998-9.0002 0-4.9706 4.02918-8.9998 8.99998-8.9998 4.9706 0 9 4.0292 9 8.9998 0 4.9707-4.0294 9.0002-9 9.0002zm.0185-2.7279v1.091c4.0584-.01 7.3449-3.3024 7.3449-7.3633 0-4.0607-3.2865-7.35293-7.3449-7.36316v1.09101c3.4559.00997 6.2541 2.81395 6.2541 6.27215 0 3.4583-2.7982 6.2623-6.2541 6.2723zm3.527-6.2723c0 1.9519-1.5778 3.5344-3.527 3.5447v1.0907c2.552-.0099 4.618-2.0809 4.618-4.6354 0-2.5543-2.066-4.6253-4.618-4.6353v1.0908c1.9492.0102 3.527 1.5927 3.527 3.5445zm-3.527-1.9081c1.0456.01 1.8906.86 1.8906 1.908 0 1.0484-.845 1.8984-1.8906 1.9084z" fill-rule="evenodd"/><path d="m10.3461 4.99805c-.3237-.07201-.6639-.08099-1.00111-.02643s-.66484.17159-.96417.34441-.56449.39804-.78035.66279c-.21585.26475-.37816.56384-.47766.8802l-.2066.65635-.67173-.1492 5c-.65378-.14527-1.36067-.03082-1.96515.31818-.60449.349-1.05705.90396-1.25814 1.54278-.20108.63883-.13422 1.30922.18589 1.86362.32011.5545.86723.9476 1.52102 1.0928l.67172.1493 4.93018 1.0955 1.5164-4.81745.2066-.65635c.0997-.31632.1345-.64373.1027-.96352-.0319-.31979-.1299-.6257-.2884-.90025s-.3744-.51236-.6354-.69985c-.261-.18748-.562-.32097-.8858-.39283z" stroke="#df58a9" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2"/></g></svg> \ No newline at end of file

1 0

[tor/master] Fix coverity warnings 1472846 / 1472845.
by asn＠torproject.org 09 Feb '21

09 Feb '21

commit b64fe4bf55e57c19bb0ade5fc08d6500ac561019 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Feb 9 18:50:20 2021 +0200 Fix coverity warnings 1472846 / 1472845. --- src/core/or/circuituse.c | 9 ++++++--- src/core/or/connection_edge.c | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 018654769d..11ba059b0e 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -2735,10 +2735,12 @@ consider_recording_trackhost(const entry_connection_t *conn, char fp[HEX_DIGEST_LEN+1]; uint64_t stream_id = 0; - if (conn) { - stream_id = ENTRY_TO_CONN(conn)->global_identifier; + if (BUG(!conn)) { + return; } + stream_id = ENTRY_TO_CONN(conn)->global_identifier; + /* Search the addressmap for this conn's destination. */ /* If they're not in the address map.. */ if (!options->TrackHostExits || @@ -2801,8 +2803,9 @@ connection_ap_handshake_attach_chosen_circuit(entry_connection_t *conn, tor_assert(conn->socks_request); if (conn->socks_request->command == SOCKS_COMMAND_CONNECT) { - if (!conn->use_begindir) + if (!conn->use_begindir) { consider_recording_trackhost(conn, circ); + } if (connection_ap_handshake_send_begin(conn) < 0) return -1; } else { diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index b212160f60..aa48d16b7c 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -3521,10 +3521,12 @@ tell_controller_about_resolved_result(entry_connection_t *conn, { uint64_t stream_id = 0; - if (conn) { - stream_id = ENTRY_TO_CONN(conn)->global_identifier; + if (BUG(!conn)) { + return; } + stream_id = ENTRY_TO_CONN(conn)->global_identifier; + expires = time(NULL) + ttl; if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) { char *cp = tor_dup_ip(ntohl(get_uint32(answer)));

1 0

[tor-browser/tor-browser-86.0b5-10.5-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 09 Feb '21

09 Feb '21

commit 8c25821d4973f33459ad9a75fc181dd5fe431b34 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 9 15:53:59 2021 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 40322: Consider disabling network.connectivity-service.enabled --- browser/app/profile/000-tor-browser.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 5ffdc386042b..885a3fe4867b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -267,8 +267,9 @@ pref("security.ssl.enable_false_start", true); pref("network.http.connection-retry-timeout", 0); pref("network.http.max-persistent-connections-per-proxy", 256); pref("network.manage-offline-status", false); -// No need to leak things to Mozilla, see bug 21790 +// No need to leak things to Mozilla, see bug 21790 and tor-browser#40322 pref("network.captive-portal-service.enabled", false); +pref("network.connectivity-service.enabled", false); // As a "defense in depth" measure, configure an empty push server URL (the // DOM Push features are disabled by default via other prefs). pref("dom.push.serverURL", "");

1 0

[tor-browser/tor-browser-78.7.1esr-10.5-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 09 Feb '21

09 Feb '21

commit 148c964c0812f2013e9e26758a3498e391687e16 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 9 15:53:59 2021 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 40322: Consider disabling network.connectivity-service.enabled --- browser/app/profile/000-tor-browser.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 1218ebfe3d49..3961eca0868a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -260,8 +260,9 @@ pref("security.ssl.enable_false_start", true); pref("network.http.connection-retry-timeout", 0); pref("network.http.max-persistent-connections-per-proxy", 256); pref("network.manage-offline-status", false); -// No need to leak things to Mozilla, see bug 21790 +// No need to leak things to Mozilla, see bug 21790 and tor-browser#40322 pref("network.captive-portal-service.enabled", false); +pref("network.connectivity-service.enabled", false); // As a "defense in depth" measure, configure an empty push server URL (the // DOM Push features are disabled by default via other prefs). pref("dom.push.serverURL", "");

1 0