tor-commits March 2016

tor-commits@lists.torproject.org

16 participants
1259 discussions

[stem/master] Support accept/reject6, *4, and *6 in exit policies
by atagar＠torproject.org 04 Mar '16

04 Mar '16

commit e4800b022d25664579a0ee5e351fd2024662a3ba Merge: 7ee9347 200dd8a Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Mar 4 09:36:24 2016 -0800 Support accept/reject6, *4, and *6 in exit policies Tor has expanded its exit policies quite a bit to provide more flexability in how IPv4 and IPv6 policies can be specified. Thanks to teor for the explanation! https://trac.torproject.org/projects/tor/ticket/16103#comment:5 docs/change_log.rst | 2 ++ stem/exit_policy.py | 82 +++++++++++++++++++++++++++---------------- test/unit/exit_policy/rule.py | 50 ++++++++++++++++++++++++-- 3 files changed, 101 insertions(+), 33 deletions(-)

1 0

[tordnsel/master] remove private System.Timeout
by arlo＠torproject.org 04 Mar '16

04 Mar '16

commit 44deb8ea00495f22cded4a08bc97bfee0f32229b Author: David Kaloper <david(a)numm.org> Date: Thu Aug 8 03:07:53 2013 +0200 remove private System.Timeout --- src/TorDNSEL/Control/Concurrent/Util.hs | 2 +- src/TorDNSEL/ExitTest/Initiator/Internals.hs | 2 +- src/TorDNSEL/ExitTest/Server/Internals.hs | 2 +- src/TorDNSEL/Statistics/Internals.hs | 2 +- src/TorDNSEL/System/Timeout.hs | 106 --------------------------- tordnsel.cabal | 1 - 6 files changed, 4 insertions(+), 111 deletions(-) diff --git a/src/TorDNSEL/Control/Concurrent/Util.hs b/src/TorDNSEL/Control/Concurrent/Util.hs index 05e71b4..cad89f4 100644 --- a/src/TorDNSEL/Control/Concurrent/Util.hs +++ b/src/TorDNSEL/Control/Concurrent/Util.hs @@ -16,9 +16,9 @@ import qualified TorDNSEL.Compat.Exception as E import Control.Concurrent.MVar (newEmptyMVar, takeMVar, putMVar, tryPutMVar) import Data.Dynamic (Dynamic) import Data.Maybe (isJust) +import System.Timeout import TorDNSEL.Control.Concurrent.Link -import TorDNSEL.System.Timeout import TorDNSEL.Util -- | A type representing a handle to a thread. diff --git a/src/TorDNSEL/ExitTest/Initiator/Internals.hs b/src/TorDNSEL/ExitTest/Initiator/Internals.hs index 06e4250..9acd2c3 100644 --- a/src/TorDNSEL/ExitTest/Initiator/Internals.hs +++ b/src/TorDNSEL/ExitTest/Initiator/Internals.hs @@ -81,6 +81,7 @@ import Network.Socket ( HostAddress, SockAddr, Family(AF_INET), SocketType(Stream) , socket, connect, sClose, socketToHandle ) import System.IO (hClose, IOMode(ReadWriteMode)) +import System.Timeout import TorDNSEL.Control.Concurrent.Link import TorDNSEL.Control.Concurrent.Util @@ -91,7 +92,6 @@ import TorDNSEL.ExitTest.Request import TorDNSEL.Log import TorDNSEL.NetworkState.Types import TorDNSEL.Socks -import TorDNSEL.System.Timeout import TorDNSEL.Util -------------------------------------------------------------------------------- diff --git a/src/TorDNSEL/ExitTest/Server/Internals.hs b/src/TorDNSEL/ExitTest/Server/Internals.hs index 4f62f37..560221a 100644 --- a/src/TorDNSEL/ExitTest/Server/Internals.hs +++ b/src/TorDNSEL/ExitTest/Server/Internals.hs @@ -41,12 +41,12 @@ import Network.Socket , socketToHandle ) import System.IO (hClose, IOMode(ReadWriteMode)) import System.IO.Error (isEOFError) +import System.Timeout import TorDNSEL.Control.Concurrent.Link import TorDNSEL.Control.Concurrent.Util import TorDNSEL.ExitTest.Request import TorDNSEL.Log -import TorDNSEL.System.Timeout import TorDNSEL.Util -- | A handle to the exit test server thread. diff --git a/src/TorDNSEL/Statistics/Internals.hs b/src/TorDNSEL/Statistics/Internals.hs index d4ef165..3dcd510 100644 --- a/src/TorDNSEL/Statistics/Internals.hs +++ b/src/TorDNSEL/Statistics/Internals.hs @@ -31,12 +31,12 @@ import qualified Data.Set as S import Network.Socket (accept, socketToHandle, Socket) import System.IO (hClose, IOMode(ReadWriteMode)) import System.IO.Unsafe (unsafePerformIO) +import System.Timeout import TorDNSEL.Control.Concurrent.Link import TorDNSEL.Control.Concurrent.Util import TorDNSEL.DNS.Server import TorDNSEL.Log -import TorDNSEL.System.Timeout import TorDNSEL.Util -- | Cumulative counts of bytes transferred, datagrams received, and responses diff --git a/src/TorDNSEL/System/Timeout.hs b/src/TorDNSEL/System/Timeout.hs deleted file mode 100644 index 761ae16..0000000 --- a/src/TorDNSEL/System/Timeout.hs +++ /dev/null @@ -1,106 +0,0 @@ -{-# OPTIONS -fglasgow-exts #-} -{- -The Glasgow Haskell Compiler License - -Copyright 2004, The University Court of the University of Glasgow. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -- Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -- Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -- Neither name of the University nor the names of its contributors may be -used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF -GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. --} - -------------------------------------------------------------------------------- --- | --- Module : TorDNSEL.System.Timeout --- Copyright : (c) The University of Glasgow 2007 --- License : BSD-style --- --- Maintainer : libraries(a)haskell.org --- Stability : experimental --- Portability : non-portable --- --- Attach a timeout event to arbitrary 'IO' computations. --- -------------------------------------------------------------------------------- - -module TorDNSEL.System.Timeout ( timeout ) where - -import Prelude (IO, Ord((<)), Eq((==)), Int, (.), otherwise, fmap) -import Data.Maybe (Maybe(..)) -import Control.Monad (Monad(..), guard) -import Control.Concurrent (forkIO, threadDelay, myThreadId, killThread) -import TorDNSEL.Compat.Exception (handleJust, throwDynTo, dynExceptions, bracket) -import Data.Dynamic (Typeable, fromDynamic) -import Data.Unique (Unique, newUnique) - --- An internal type that is thrown as a dynamic exception to --- interrupt the running IO computation when the timeout has --- expired. - -data Timeout = Timeout Unique deriving (Eq, Typeable) - --- |Wrap an 'IO' computation to time out and return @Nothing@ in case no result --- is available within @n@ microseconds (@1\/10^6@ seconds). In case a result --- is available before the timeout expires, @Just a@ is returned. A negative --- timeout interval means \"wait indefinitely\". When specifying long timeouts, --- be careful not to exceed @maxBound :: Int@. --- --- The design of this combinator was guided by the objective that @timeout n f@ --- should behave exactly the same as @f@ as long as @f@ doesn't time out. This --- means that @f@ has the same 'myThreadId' it would have without the timeout --- wrapper. Any exceptions @f@ might throw cancel the timeout and propagate --- further up. It also possible for @f@ to receive exceptions thrown to it by --- another thread. --- --- A tricky implementation detail is the question of how to abort an @IO@ --- computation. This combinator relies on asynchronous exceptions internally. --- The technique works very well for computations executing inside of the --- Haskell runtime system, but it doesn't work at all for non-Haskell code. --- Foreign function calls, for example, cannot be timed out with this --- combinator simply because an arbitrary C function cannot receive --- asynchronous exceptions. When @timeout@ is used to wrap an FFI call that --- blocks, no timeout event can be delivered until the FFI call returns, which --- pretty much negates the purpose of the combinator. In practice, however, --- this limitation is less severe than it may sound. Standard I\/O functions --- like 'System.IO.hGetBuf', 'System.IO.hPutBuf', 'Network.Socket.accept', or --- 'System.IO.hWaitForInput' appear to be blocking, but they really don't --- because the runtime system uses scheduling mechanisms like @select(2)@ to --- perform asynchronous I\/O, so it is possible to interrupt standard socket --- I\/O or file I\/O using this combinator. - -timeout :: Int -> IO a -> IO (Maybe a) -timeout n f - | n < 0 = fmap Just f - | n == 0 = return Nothing - | otherwise = do - pid <- myThreadId - ex <- fmap Timeout newUnique - handleJust (\e -> dynExceptions e >>= fromDynamic >>= guard . (ex ==)) - (\_ -> return Nothing) - (bracket (forkIO (threadDelay n >> throwDynTo pid ex)) - (killThread) - (\_ -> fmap Just f)) diff --git a/tordnsel.cabal b/tordnsel.cabal index b51252d..c27fa2b 100644 --- a/tordnsel.cabal +++ b/tordnsel.cabal @@ -52,7 +52,6 @@ Other-Modules: TorDNSEL.Config, TorDNSEL.Socks.Internals, TorDNSEL.Statistics, TorDNSEL.Statistics.Internals, - TorDNSEL.System.Timeout, TorDNSEL.TorControl, TorDNSEL.TorControl.Internals, TorDNSEL.Util

1 0

[nyx/master] Use STEM_CONNECTION attributes for tests
by atagar＠torproject.org 04 Mar '16

04 Mar '16

commit 9d36a37adc5499ed0e26a4d9ce5d2d5ae443efe8 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Thu Mar 3 23:41:03 2016 +0530 Use STEM_CONNECTION attributes for tests --- test/util/tracker/connection_tracker.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/test/util/tracker/connection_tracker.py b/test/util/tracker/connection_tracker.py index 797c76b..52fed10 100644 --- a/test/util/tracker/connection_tracker.py +++ b/test/util/tracker/connection_tracker.py @@ -7,9 +7,11 @@ from stem.util import connection from mock import Mock, patch -STEM_CONNECTION_1 = connection.Connection('127.0.0.1', 3531, '75.119.206.243', 22, 'tcp', False) -STEM_CONNECTION_2 = connection.Connection('127.0.0.1', 1766, '86.59.30.40', 443, 'tcp', False) -STEM_CONNECTION_3 = connection.Connection('127.0.0.1', 1059, '74.125.28.106', 80, 'tcp', False) +STEM_CONNECTIONS = [ + connection.Connection('127.0.0.1', 3531, '75.119.206.243', 22, 'tcp', False), + connection.Connection('127.0.0.1', 1766, '86.59.30.40', 443, 'tcp', False), + connection.Connection('127.0.0.1', 1059, '74.125.28.106', 80, 'tcp', False) +] class TestConnectionTracker(unittest.TestCase): @@ -20,7 +22,7 @@ class TestConnectionTracker(unittest.TestCase): def test_fetching_connections(self, get_value_mock, tor_controller_mock): tor_controller_mock().get_pid.return_value = 12345 tor_controller_mock().get_conf.return_value = '0' - get_value_mock.return_value = [STEM_CONNECTION_1, STEM_CONNECTION_2, STEM_CONNECTION_3] + get_value_mock.return_value = STEM_CONNECTIONS with ConnectionTracker(0.04) as daemon: time.sleep(0.01) @@ -28,7 +30,7 @@ class TestConnectionTracker(unittest.TestCase): connections = daemon.get_value() self.assertEqual(1, daemon.run_counter()) - self.assertEqual(['75.119.206.243', '86.59.30.40', '74.125.28.106'], [conn.remote_address for conn in connections]) + self.assertEqual([conn.remote_address for conn in STEM_CONNECTIONS], [conn.remote_address for conn in connections]) get_value_mock.return_value = [] # no connection results time.sleep(0.05) @@ -65,7 +67,7 @@ class TestConnectionTracker(unittest.TestCase): # Now make connection resolution work. We still shouldn't provide any # results since we stopped looking. - get_value_mock.return_value = [STEM_CONNECTION_1, STEM_CONNECTION_2] + get_value_mock.return_value = STEM_CONNECTIONS[:2] get_value_mock.side_effect = None time.sleep(0.05) self.assertEqual([], daemon.get_value()) @@ -75,7 +77,7 @@ class TestConnectionTracker(unittest.TestCase): daemon.set_custom_resolver(connection.Resolver.NETSTAT) time.sleep(0.05) - self.assertEqual(['75.119.206.243', '86.59.30.40'], [conn.remote_address for conn in daemon.get_value()]) + self.assertEqual([conn.remote_address for conn in STEM_CONNECTIONS[:2]], [conn.remote_address for conn in daemon.get_value()]) @patch('nyx.util.tracker.tor_controller') @patch('nyx.util.tracker.connection.get_connections') @@ -84,7 +86,7 @@ class TestConnectionTracker(unittest.TestCase): def test_tracking_uptime(self, get_value_mock, tor_controller_mock): tor_controller_mock().get_pid.return_value = 12345 tor_controller_mock().get_conf.return_value = '0' - get_value_mock.return_value = [STEM_CONNECTION_1] + get_value_mock.return_value = [STEM_CONNECTIONS[0]] first_start_time = time.time() with ConnectionTracker(0.04) as daemon: @@ -93,21 +95,21 @@ class TestConnectionTracker(unittest.TestCase): connections = daemon.get_value() self.assertEqual(1, len(connections)) - self.assertEqual('75.119.206.243', connections[0].remote_address) + self.assertEqual(STEM_CONNECTIONS[0].remote_address, connections[0].remote_address) self.assertTrue(first_start_time < connections[0].start_time < time.time()) self.assertTrue(connections[0].is_legacy) second_start_time = time.time() - get_value_mock.return_value = [STEM_CONNECTION_1, STEM_CONNECTION_2] + get_value_mock.return_value = STEM_CONNECTIONS[:2] time.sleep(0.05) connections = daemon.get_value() self.assertEqual(2, len(connections)) - self.assertEqual('75.119.206.243', connections[0].remote_address) + self.assertEqual(STEM_CONNECTIONS[0].remote_address, connections[0].remote_address) self.assertTrue(first_start_time < connections[0].start_time < time.time()) self.assertTrue(connections[0].is_legacy) - self.assertEqual('86.59.30.40', connections[1].remote_address) + self.assertEqual(STEM_CONNECTIONS[1].remote_address, connections[1].remote_address) self.assertTrue(second_start_time < connections[1].start_time < time.time()) self.assertFalse(connections[1].is_legacy)

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 04 Mar '16

04 Mar '16

commit 8586eb7c669b7c7227933af34e8935099d861148 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 4 14:45:04 2016 +0000 Update translations for bridgedb --- ko/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po index 4022c54..f151c48 100644 --- a/ko/LC_MESSAGES/bridgedb.po +++ b/ko/LC_MESSAGES/bridgedb.po @@ -4,6 +4,7 @@ # # Translators: # ilbe123 <a3057016(a)drdrb.net>, 2014 +# Chris Park <utopinator(a)gmail.com>, 2016 # cwt96 <cwt967(a)naver.com>, 2012 # 고영욱 <greenknite(a)naver.com>, 2015 # Jamin <bakzaa(a)gmail.com>, 2014 @@ -19,8 +20,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-01-07 11:06+0000\n" -"Last-Translator: sangmin lee <sangminlee7648(a)gmail.com>\n" +"PO-Revision-Date: 2016-03-04 14:28+0000\n" +"Last-Translator: Chris Park <utopinator(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -234,7 +235,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "" +msgstr "BridgeDB 는 여러 종류의 %s삽입형 장치%s 와의 브릿지를 제공합니다.\nwhich can help obfuscate your connections to the Tor Network, making it more\ndifficult for anyone watching your internet traffic to determine that you are\nusing Tor.\n\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -382,7 +383,7 @@ msgstr "IPv6 브릿지를 요청합니다." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." -msgstr "" +msgstr "삽입형 장치를 TYPE 를 통해서 요청하세요." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG".

1 0

[tor-browser-bundle/master] Add new HTTPS-Everywhere signing key
by gk＠torproject.org 04 Mar '16

04 Mar '16

commit 1619b2617cb1d36fc7a572b0a567a46b6a10ba72 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 4 11:55:59 2016 +0000 Add new HTTPS-Everywhere signing key --- gitian/gpg/https-everywhere.gpg | Bin 188424 -> 194393 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg index 43aa4e4..fdd8d4f 100644 Binary files a/gitian/gpg/https-everywhere.gpg and b/gitian/gpg/https-everywhere.gpg differ

1 0

[tor-browser-bundle/master] Release preparations for 6.0a3
by gk＠torproject.org 04 Mar '16

04 Mar '16

commit 305e873ba4edec89e6224d4df5f9e1bdef6d4760 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 4 11:52:42 2016 +0000 Release preparations for 6.0a3 --- Bundle-Data/Docs/ChangeLog.txt | 20 ++++++++++++++++++++ gitian/versions.alpha | 16 ++++++++-------- tools/update-responses/config.yml | 12 ++++++------ 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 79ac5fa..fcee2bb 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,23 @@ +Tor Browser 6.0a3 -- March 8 + * All Platforms + * Update Firefox to 38.7.0esr + * Update Tor to 0.2.8.1-alpha + * Update OpenSSL to 1.0.1s + * Update NoScript to 2.9.0.4 + * Update HTTPS Everywhere to 5.1.4 + * Update Torbutton to 1.9.5.1 + * Bug 16990: Don't mishandle multiline commands + * Bug 18144: about:tor update arrow position is wrong + * Bug 16725: Allow resizing with non-default homepage + * Bug 16917: Allow users to more easily set a non-tor SSH proxy + * Translation updates + * Bug 18030: Isolate favicon requests on Page Info dialog + * Bug 18297: Use separate Noto JP,KR,SC,TC fonts + * Bug 18170: Make sure the homepage is shown after an update as well + * Bug 16728: Add test cases for favicon isolation + * Windows + * Bug 18292: Disable staged updates on Windows + Tor Browser 6.0a2-hardened -- February 15 2016 * All Platforms * Update Firefox to 38.6.1esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 10fd209..f94ad7a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -7,15 +7,15 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.6.1esr +FIREFOX_VERSION=38.7.0esr TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 -TOR_TAG=tor-0.2.7.6 +TOR_TAG=tor-0.2.8.1-alpha TORLAUNCHER_TAG=0.2.9 -TORBUTTON_TAG=1.9.5 -HTTPSE_TAG=5.1.2 +TORBUTTON_TAG=1.9.5.1 +HTTPSE_TAG=5.1.4 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -38,7 +38,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-9 -OPENSSL_VER=1.0.1q +OPENSSL_VER=1.0.1s GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -58,7 +58,7 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.3-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -84,13 +84,13 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 +OPENSSL_HASH=e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9 +NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 2827471..a28f18a 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 6.0a2 + alpha: 6.0a3 release: 5.5 versions: 5.5: @@ -23,12 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.0a2: - platformVersion: 38.6.1 - detailsURL: https://blog.torproject.org/blog/tor-browser-60a2-released - download_url: https://www.torproject.org/dist/torbrowser/6.0a2 + 6.0a3: + platformVersion: 38.7.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-60a3-released + download_url: https://www.torproject.org/dist/torbrowser/6.0a3 incremental_from: - - 6.0a1 + - 6.0a2 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser/tor-browser-38.6.1esr-6.0-1] Bug 18292: Staged updates fail on Windows
by gk＠torproject.org 04 Mar '16

04 Mar '16

commit 39f394ef4f103cec0599687118dd7298b3c3981a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Feb 15 10:44:25 2016 -0500 Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. --- browser/app/profile/000-tor-browser.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index dfe317f..0dd4e5b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -21,6 +21,11 @@ pref("app.update.promptWaitTime", 3600); pref("app.update.badge", true); pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues +#ifdef XP_WIN +// For now, disable staged updates on Windows (see #18292). +pref("app.update.staging.enabled", false); +#endif + // Disable "Slow startup" warnings and associated disk history // (bug #13346) pref("browser.slowStartup.notificationDisabled", true);

1 0

[torbutton/master] Release preparations for 1.9.5.1
by gk＠torproject.org 04 Mar '16

04 Mar '16

commit d95f13fe12f13f9501a19dff77e4ad2d2320499a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 4 11:22:28 2016 +0000 Release preparations for 1.9.5.1 CHANGELOG update, translation update, version bump --- src/CHANGELOG | 7 +++++++ src/chrome/locale/ar/aboutTBUpdate.dtd | 2 +- src/chrome/locale/ar/torbutton.dtd | 6 +++--- src/chrome/locale/ar/torbutton.properties | 10 +++++----- src/chrome/locale/eu/aboutTor.dtd | 6 +++--- src/chrome/locale/it/torbutton.dtd | 2 +- src/chrome/locale/nl/torbutton.dtd | 2 +- src/install.rdf | 2 +- 8 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 3c24227..fc5e96a 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +1.9.5.1 + * Bug 16990: Don't mishandle multiline commands + * Bug 18144: about:tor update arrow position is wrong + * Bug 16725: Allow resizing with non-default homepage + * Bug 16017: Allow users to more easily set a non-tor SSH proxy + * Translation updates + 1.9.5 * Bug 16990: Show circuit display for connections using multi-party channels * Bug 18019: Avoid empty prompt shown after non-en-US update diff --git a/src/chrome/locale/ar/aboutTBUpdate.dtd b/src/chrome/locale/ar/aboutTBUpdate.dtd index ce40b98..41fd873 100644 --- a/src/chrome/locale/ar/aboutTBUpdate.dtd +++ b/src/chrome/locale/ar/aboutTBUpdate.dtd @@ -3,4 +3,4 @@ <!ENTITY aboutTBUpdate.linkPrefix "للحصول على أحدث المعلومات حول هذا الإصدار."> <!ENTITY aboutTBUpdate.linkLabel "زُر موقعنا"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.changeLogHeading "تغير سجل:"> diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index ebcbf72..b9f7205 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -161,7 +161,7 @@ <!ENTITY torbutton.prefs.sec_some_jit_desc "بعض محسنات نصوص الجافا معطلة"> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "سكربت في بعض المواقع قد تعمل بشكل بطيئ"> <!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> <!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> @@ -170,13 +170,13 @@ <!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_desc "بعض ميزات إظهار الخطوط معطلة "> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> +<!ENTITY torbutton.prefs.sec_svg_desc "بعض الانواع من الصور معطله"> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> <!ENTITY torbutton.prefs.sec_high "عالٍ"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "معضم صيغ السمعيات والمرئيات معطلة"> <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> <!ENTITY torbutton.prefs.sec_webfonts_desc "من الممكن أن بعض الخطوط والايقونات معروضة خطأ"> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties index 6828a3e..4603989 100644 --- a/src/chrome/locale/ar/torbutton.properties +++ b/src/chrome/locale/ar/torbutton.properties @@ -2,12 +2,12 @@ torbutton.button.tooltip.disabled = فعّل تور torbutton.button.tooltip.enabled = عطّل تور torbutton.circuit_display.internet = انترنت torbutton.circuit_display.ip_unknown = IP غير معروف -torbutton.circuit_display.onion_site = Onion site +torbutton.circuit_display.onion_site = موقع اونيون torbutton.circuit_display.this_browser = هذا المتصفح -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = مُرحل torbutton.circuit_display.tor_bridge = جسر torbutton.circuit_display.unknown_country = بلد غير معروف -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = يضيف متصفح تور هذا الهامش لابقاء نافذتك غير مميزه، لتقليل امكانيه تقفيك عبر الانترنت. torbutton.panel.tooltip.disabled = انقر لتفعيل تور torbutton.panel.tooltip.enabled = انقر لتعطيل تور torbutton.panel.plugins.disabled = انقر لتفعيل الملحقات @@ -59,7 +59,7 @@ torbutton.popup.confirm_newnym = متصفح تور torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = تكبير متصفح تور قد يسمح لبعض المواقع بالتعرف على حجم شاشتك، واستخدام هذه المعلومات لتقفيك. نوصي بابقاء نافذه متصف تور على حجمها الافتراضي. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=هذا الموقع (٪ S) حاول استخراج بيانات الصورة HTML5، والتي يمكن استخدامها لتحديد مكانك وتحديد الكومبيوتر.\n\nهل تريد أن يسمح متصفح Tor لهذا الموقع لاستخراج بيانات الصورة ؟ @@ -72,7 +72,7 @@ canvas.neverAccessKey=ط # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem +profileProblemTitle=%Sمشكله في ملف شخصي profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 76020fc..7524fc2 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Tori buruz"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "KONUTZ: nabigatzaile hau zaharkituta dago."> <!ENTITY aboutTor.outOfDateTorOff.label "BAITA, nabigatzaile hau zaharkituta dago."> <!ENTITY aboutTor.outOfDate2.label "Tipulan sakatu eta ondoren Tor Browser Bundlea egiaztatu hautatu"> <!ENTITY aboutTor.check.label "Tor sare ezarpenak frogatu"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Ongi etorri Tor Browserera"> +<!ENTITY aboutTor.success2.label "Tor sarera konektatuta."> <!ENTITY aboutTor.success3.label "Aske zara orain Internet anonimotasunez nabigatzeko."> <!ENTITY aboutTor.failure.label "Zerbait gaizki joan da!"> <!ENTITY aboutTor.failure2.label "Tor ez da nabigatzaile honetan funtzionatzen ari."> diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index c92526f..f08b41d 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -180,6 +180,6 @@ <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM è l'unico codec che rimane abilitato."> <!ENTITY torbutton.prefs.sec_webfonts_desc "Alcuni caratteri e icone possono non essere visualizzati correttamente."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "I font provvisti dal sito sono bloccati."> -<!ENTITY torbutton.prefs.sec_custom "Valori Customizzabili"> +<!ENTITY torbutton.prefs.sec_custom "Valori personalizzati"> <!ENTITY torbutton.circuit_display.title "Circuito Tor per questo sito"> diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index 1522697..08e3703 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -1,4 +1,4 @@ -<!ENTITY torbutton.prefs.title "Torbutton voorkeuren"> +<!ENTITY torbutton.prefs.title "Torbutton Voorkeuren"> <!ENTITY torbutton.prefs.tor_settings "Proxy-instellingen"> <!ENTITY torbutton.prefs.recommended_settings "De aanbevolen proxy-instellingen voor mijn versie van Firefox gebruiken"> <!ENTITY torbutton.prefs.use_privoxy "Privoxy gebruiken"> diff --git a/src/install.rdf b/src/install.rdf index b75ddbe..531ab16 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.5</em:version> + <em:version>1.9.5.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Bug 16917: Allow users to more easily set a non-tor SSH proxy.
by gk＠torproject.org 04 Mar '16

04 Mar '16

commit 06800f1c9c0a3c2adf850f9ad70e7ee8c3e645d0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 18 14:22:47 2016 -0800 Bug 16917: Allow users to more easily set a non-tor SSH proxy. Creates a hidden torbutton pref, which if set, allows Tor Browser to work with non-Tor proxies (by disabling our use of SOCKS u+p auth). Enabling this pref also enables NoScript ABE (to prevent proxied connections from hitting localhost/RFC1918) and executes New Identity. --- src/chrome/content/torbutton.js | 40 ++++++++++++++++++++++++++++++++- src/chrome/content/torbutton_util.js | 4 ++++ src/components/domain-isolator.js | 21 +++++++++++++++++ src/defaults/preferences/preferences.js | 1 + 4 files changed, 65 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index bf45fea..ce49a57 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -233,6 +233,9 @@ var torbutton_unique_pref_observer = case "extensions.torbutton.block_disk": torbutton_update_disk_prefs(); break; + case "extensions.torbutton.use_nontor_proxy": + torbutton_use_nontor_proxy(); + break; case "extensions.torbutton.resist_fingerprinting": case "extensions.torbutton.spoof_english": torbutton_update_fingerprinting_prefs(); @@ -2004,11 +2007,41 @@ function torbutton_clear_image_caches() } } +/* Called when we switch the use_nontor_proxy pref in either direction. + * + * Enables/disables domain isolation and NoScript ABE, and then does + * new identity + */ +function torbutton_use_nontor_proxy() +{ + let nontor_mode = m_tb_prefs.getBoolPref("extensions.torbutton.use_nontor_proxy"); + let domainIsolator = Cc["@torproject.org/domain-isolator;1"] + .getService(Ci.nsISupports).wrappedJSObject; + + if (m_tb_prefs.getBoolPref("extensions.torbutton.use_nontor_proxy")) { + // We need to enable ABE because non-tor proxies won't reject localhost + // and RFC1918, and we should block them. (The default ABE policy does this). + m_tb_prefs.setBoolPref("noscript.ABE.enabled", true); + + // Disable domain isolation + domainIsolator.disableIsolation(); + } else { + m_tb_prefs.setBoolPref("noscript.ABE.enabled", false); + + domainIsolator.enableIsolation(); + } + + // Always reset our identity if the proxy has changed from tor + // to non-tor. + torbutton_do_new_identity(); +} + function torbutton_do_tor_check() { let checkSvc = Cc["@torproject.org/torbutton-torCheckService;1"] .getService(Ci.nsISupports).wrappedJSObject; if (checkSvc.kCheckNotInitiated != checkSvc.statusOfTorCheck || + m_tb_prefs.getBoolPref("extensions.torbutton.use_nontor_proxy") || !m_tb_prefs.getBoolPref("extensions.torbutton.test_enabled")) return; // Only do the check once. @@ -3161,7 +3194,12 @@ function torbutton_close_window(event) { var enumerator = wm.getEnumerator("navigator:browser"); while(enumerator.hasMoreElements()) { var win = enumerator.getNext(); - if(win != window) { + // For some reason, when New Identity is called from a pref + // observer (ex: torbutton_use_nontor_proxy) on an ASAN build, + // we sometimes don't have this symbol set in the new window yet. + // However, the new window will run this init later in that case, + // as it does in the OSX case. + if(win != window && "torbutton_do_main_window_startup" in win) { torbutton_log(3, "Found another window"); win.torbutton_do_main_window_startup(); m_tb_is_main_window = false; diff --git a/src/chrome/content/torbutton_util.js b/src/chrome/content/torbutton_util.js index 1ec6dcc..68276d0 100644 --- a/src/chrome/content/torbutton_util.js +++ b/src/chrome/content/torbutton_util.js @@ -148,6 +148,10 @@ function torbutton_check_status() { return false; } + if (torprefs.getBoolPref("use_nontor_proxy")) { + return true; + } + if (torbutton_check_socks_remote_dns()) remote_dns = liveprefs.getBoolPref("socks_remote_dns"); else diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index 93c7f65..caf45cf 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -53,6 +53,10 @@ let tor = tor || {}; // A mutable map that records what nonce we are using for each domain. tor.noncesForDomains = {}; +// __tor.isolationEabled__. +// A bool that controls if we use SOCKS auth for isolation or not. +tor.isolationEnabled = true; + // __tor.unknownDirtySince__. // Specifies when the current catch-all circuit was first used tor.unknownDirtySince = Date.now(); @@ -96,6 +100,9 @@ tor.newCircuitForDomain = function(domain) { // combination. tor.isolateCircuitsByDomain = function () { mozilla.registerProxyChannelFilter(function (aChannel, aProxy) { + if (!tor.isolationEnabled) + return aProxy; + try { let channel = aChannel.QueryInterface(Ci.nsIChannel), firstPartyURI = mozilla.thirdPartyUtil.getFirstPartyURIFromChannel(channel, true) @@ -145,6 +152,12 @@ DomainIsolator.prototype = { observe: function (subject, topic, data) { if (topic === "profile-after-change") { logger.eclog(3, "domain isolator: set up isolating circuits by domain"); + + let prefs = Cc["@mozilla.org/preferences-service;1"] + .getService(Ci.nsIPrefBranch); + if (prefs.getBoolPref("extensions.torbutton.use_nontor_proxy")) { + tor.isolationEnabled = false; + } tor.isolateCircuitsByDomain(); } }, @@ -152,6 +165,14 @@ DomainIsolator.prototype = { tor.newCircuitForDomain(domain); }, + enableIsolation: function() { + tor.isolationEnabled = true; + }, + + disableIsolation: function() { + tor.isolationEnabled = false; + }, + wrappedJSObject: null }; diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 46bfc0e..548f4ed 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -33,6 +33,7 @@ pref("extensions.torbutton.test_failed",false); pref("extensions.torbutton.no_proxies_on",""); pref("extensions.torbutton.versioncheck_url","https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions"); pref("extensions.torbutton.versioncheck_enabled",true); +pref("extensions.torbutton.use_nontor_proxy",false); // XXX: wtf prefs? These seem not actually connected, but govern // if user wants own tor proxy settings

1 0

[torbutton/master] fixup! Bug 16917: Allow users to more easily set a non-tor SSH proxy.
by gk＠torproject.org 04 Mar '16

04 Mar '16

commit 8f40dd361efd3704a65ac8647f814f0415399da0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 4 10:10:01 2016 +0000 fixup! Bug 16917: Allow users to more easily set a non-tor SSH proxy. --- src/chrome/content/torbutton.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index ce49a57..63d3493 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2014,7 +2014,6 @@ function torbutton_clear_image_caches() */ function torbutton_use_nontor_proxy() { - let nontor_mode = m_tb_prefs.getBoolPref("extensions.torbutton.use_nontor_proxy"); let domainIsolator = Cc["@torproject.org/domain-isolator;1"] .getService(Ci.nsISupports).wrappedJSObject;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2016