January 2016 - tor-commits - lists.torproject.org

[snowflake/master] broker successfully passing client offers to snowflake proxy (#1)
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit 7081e6328c34db31fec437aabaac829a9280e0f9 Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu Jan 21 11:40:42 2016 -0800 broker successfully passing client offers to snowflake proxy (#1) --- broker/snowflake-broker.go | 11 ++++---- proxy/broker.coffee | 64 +++++++++++++++++++++++++------------------- proxy/snowflake.coffee | 48 +++++++++++++++++++++++---------- 3 files changed, 76 insertions(+), 47 deletions(-) diff --git a/broker/snowflake-broker.go b/broker/snowflake-broker.go index 279b2b6..1d26eb1 100644 --- a/broker/snowflake-broker.go +++ b/broker/snowflake-broker.go @@ -2,7 +2,7 @@ package snowflake_broker import ( "container/heap" - "fmt" + // "fmt" "io/ioutil" "log" "net" @@ -104,8 +104,8 @@ func clientHandler(w http.ResponseWriter, r *http.Request) { // TODO: Make this much better. snowflake := heap.Pop(snowflakes).(*Snowflake) if nil == snowflake { + // w.Header().Set("Status", http.StatusServiceUnavailable) w.Write([]byte("no snowflake proxies available")) - // w.WriteHeader(http.StatusServiceUnavailable) return } // snowflakes = snowflakes[1:] @@ -135,10 +135,11 @@ func proxyHandler(w http.ResponseWriter, r *http.Request) { log.Println("Passing client offer to snowflake.") w.Write(offer) case <-time.After(time.Second * 10): - s := fmt.Sprintf("%d snowflakes left.", snowflakes.Len()) - w.Write([]byte("timed out. " + s)) + // s := fmt.Sprintf("%d snowflakes left.", snowflakes.Len()) + // w.Write([]byte("timed out. " + s)) + // w.Header().Set("Status", http.StatusRequestTimeout) + w.WriteHeader(http.StatusGatewayTimeout) heap.Remove(snowflakes, snowflake.index) - // w.WriteHeader(http.StatusRequestTimeout) } } diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 9432e5c..688d45d 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -5,43 +5,51 @@ Browser snowflakes must register with the broker in order to get assigned to clients. ### +STATUS_OK = 200 +STATUS_GATEWAY_TIMEOUT = 504 + # Represents a broker running remotely. class Broker + + clients: 0 + # When interacting with the Broker, snowflake must generate a unique session # ID so the Broker can keep track of which signalling channel it's speaking # to. constructor: (@url) -> log 'Using Broker at ' + @url + clients = 0 # Snowflake registers with the broker using an HTTP POST request, and expects - # a response from the broker containing some client offer - register: -> - # base_url = this.fac_url.replace(/\?.*/, ""); - # url = base_url + "?" + build_query_string(params); - xhr = new XMLHttpRequest() - try - xhr.open 'POST', @url - catch err - ### - An exception happens here when, for example, NoScript allows the domain on - which the proxy badge runs, but not the domain to which it's trying to - make the HTTP request. The exception message is like "Component returned - failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. - ### - log 'Broker: exception while connecting: ' + err.message - return - - # xhr.responseType = 'text' - xhr.onreadystatechange = -> - if xhr.DONE == xhr.readyState - log 'Broker: ' + xhr.status - if 200 == xhr.status - log 'Response: ' + xhr.responseText - log xhr - else - log 'Broker error ' + xhr.status + ' - ' + xhr.statusText - xhr.send 'snowflake-testing' - log "Broker: sent a registration message, waiting for reply..." + # a response from the broker containing some client offer. + # TODO: Actually support multiple clients. + getClientOffer: -> + new Promise (fulfill, reject) => + xhr = new XMLHttpRequest() + try + xhr.open 'POST', @url + catch err + ### + An exception happens here when, for example, NoScript allows the domain + on which the proxy badge runs, but not the domain to which it's trying + to make the HTTP request. The exception message is like "Component + returned failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. + ### + log 'Broker: exception while connecting: ' + err.message + return + xhr.onreadystatechange = -> + return if xhr.DONE != xhr.readyState + switch xhr.status + when STATUS_OK + fulfill xhr.responseText # Should contain offer. + when STATUS_GATEWAY_TIMEOUT + reject 'Timed out waiting for a client to serve. Retrying...' + else + log 'Broker ERROR: Unexpected ' + xhr.status + + ' - ' + xhr.statusText + + xhr.send 'snowflake-testing' + log "Broker: polling for client offer..." sendAnswer: (answer) -> log 'Sending answer to broker.' diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 1b837d5..646b9b4 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -9,6 +9,7 @@ this must always act as the answerer. ### DEFAULT_WEBSOCKET = '192.81.135.242:9901' DEFAULT_BROKER = 'https://snowflake-reg.appspot.com/proxy' +COPY_PASTE_ENABLED = false DEFAULT_PORTS = http: 80 https: 443 @@ -58,7 +59,7 @@ class Snowflake $badge: null state: MODE.INIT - constructor: -> + constructor: (@broker) -> if HEADLESS # No badge else if DEBUG @@ -98,6 +99,27 @@ class Snowflake @makeProxyPair @relayAddr @proxyPair = @proxyPairs[0] + # Poll broker for clients. + findClients: -> + poll = => + recv = broker.getClientOffer() + recv.then((desc) => + log 'Received:\n\n' + desc + '\n' + offer = JSON.parse desc + @receiveOffer offer + , (err) -> + log err + setTimeout(poll, 1000) + ) + poll() + + # if @proxyPairs.length >= MAX_NUM_CLIENTS * CONNECTIONS_PER_CLIENT + # setTimeout(@proxyMain, @broker_poll_interval * 1000) + # return + # params = [['r', '1']] + # params.push ['transport', 'websocket'] + # params.push ['transport', 'webrtc'] + # Receive an SDP offer from client plugin. receiveOffer: (desc) => sdp = new RTCSessionDescription desc @@ -117,14 +139,6 @@ class Snowflake promise = @proxyPair.pc.createAnswer next promise.then next if promise - # Poll broker when this snowflake can support more clients. - proxyMain: -> - if @proxyPairs.length >= MAX_NUM_CLIENTS * CONNECTIONS_PER_CLIENT - setTimeout(@proxyMain, @broker_poll_interval * 1000) - return - params = [['r', '1']] - params.push ['transport', 'websocket'] - params.push ['transport', 'webrtc'] makeProxyPair: (relay) -> pair = new ProxyPair null, relay, @rateLimit @@ -156,6 +170,7 @@ class Snowflake @badge.die() if @badge snowflake = null +broker = null # ## -- DOM & Inputs -- # @@ -170,7 +185,9 @@ Interface = # Local input from keyboard into message window. acceptInput: -> msg = $input.value - switch snowflake.state + if !COPY_PASTE_ENABLED + log 'No input expected - Copy Paste Signalling disabled.' + else switch snowflake.state when MODE.INIT # Set target relay. if !(snowflake.setRelayAddr msg) @@ -224,10 +241,13 @@ init = -> $input.onkeydown = (e) -> $send.onclick() if 13 == e.keyCode # enter log '== snowflake browser proxy ==' - snowflake = new Snowflake() - window.snowflake = snowflake broker = new Broker DEFAULT_BROKER - broker.register() - log 'Input desired relay address:' + snowflake = new Snowflake(broker) + window.snowflake = snowflake + if COPY_PASTE_ENABLED + log 'Input desired relay address:' + else + snowflake.setRelayAddr DEFAULT_WEBSOCKET + snowflake.findClients() window.onload = init if window

1 0

[snowflake/master] Also skip creating named pipe if --meek is enabled, and output a more useful waiting message if pipe is expected
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit f2d8a749f448bfbfd69a454c0ce7b14b56143513 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Jan 20 15:51:22 2016 -0800 Also skip creating named pipe if --meek is enabled, and output a more useful waiting message if pipe is expected --- client/snowflake.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/snowflake.go b/client/snowflake.go index 076080d..ad496f9 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -331,7 +331,8 @@ func main() { log.Println("starting") - if offerURL == "" { + if offerURL == "" && !meekEnabled { + log.Println("No HTTP signaling detected. Waiting for a \"signal\" pipe...") // This FIFO receives signaling messages. err = syscall.Mkfifo("signal", 0600) if err != nil {

1 0

[snowflake/master] Initial broker registration of browser proxies
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit 28e557fb4368878134c345f0951d8ee824525617 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Jan 20 16:16:20 2016 -0800 Initial broker registration of browser proxies - broker.coffee contains the xhr stuff - COR enabled on the go broker - POST body reflection works --- broker/snowflake-broker.go | 2 +- proxy/Cakefile | 1 + proxy/broker.coffee | 49 ++++++++++++++++++++++++++++++++++++++++++++ proxy/snowflake.coffee | 13 ++++++------ 4 files changed, 57 insertions(+), 8 deletions(-) diff --git a/broker/snowflake-broker.go b/broker/snowflake-broker.go index 6bcff63..4c0e62f 100644 --- a/broker/snowflake-broker.go +++ b/broker/snowflake-broker.go @@ -48,7 +48,7 @@ func regHandler(w http.ResponseWriter, r *http.Request) { return log.Println("Invalid data.") } - + w.Header().Set("Access-Control-Allow-Origin", "*") // TODO: Get browser snowflake to talkto this appengine instance // so it can reply with an answer, and not just the offer again :) // TODO: Real broker which matches clients and snowflake proxies. diff --git a/proxy/Cakefile b/proxy/Cakefile index d657e17..499de94 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -7,6 +7,7 @@ FILES = [ 'util.coffee' 'proxypair.coffee' 'websocket.coffee' + 'broker.coffee' 'snowflake.coffee' ] FILES_TEST = [ diff --git a/proxy/broker.coffee b/proxy/broker.coffee new file mode 100644 index 0000000..fb2add9 --- /dev/null +++ b/proxy/broker.coffee @@ -0,0 +1,49 @@ +### +Communication with the snowflake broker. + +Browser snowflakes must register with the broker in order +to get assigned to clients. +### + +# Represents a broker running remotely. +class Broker + # When interacting with the Broker, snowflake must generate a unique session + # ID so the Broker can keep track of which signalling channel it's speaking + # to. + constructor: (@url) -> + log 'Using Broker at ' + @url + + # Snowflake registers with the broker using an HTTP POST request, and expects + # a response from the broker containing some client offer + register: -> + # base_url = this.fac_url.replace(/\?.*/, ""); + # url = base_url + "?" + build_query_string(params); + xhr = new XMLHttpRequest() + try + xhr.open 'POST', @url + xhr + catch err + ### + An exception happens here when, for example, NoScript allows the domain on + which the proxy badge runs, but not the domain to which it's trying to + make the HTTP request. The exception message is like "Component returned + failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. + ### + log 'Broker: exception while connecting: ' + err.message + return + + # xhr.responseType = 'text' + xhr.onreadystatechange = -> + if xhr.DONE == xhr.readyState + if 200 == xhr.status + log 'Broker: success' + log 'Response: ' + xhr.responseText + # @fac_complete xhr.responseText + else + log 'Broker error ' + xhr.status + ' - ' + xhr.statusText + + xhr.send 'snowflake-testing' + + sendAnswer: (answer) -> + log 'Sending answer to broker.' + log answer diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index a7f64a8..ac59419 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -8,6 +8,7 @@ Assume that the webrtc client plugin is always the offerer, in which case this must always act as the answerer. ### DEFAULT_WEBSOCKET = '192.81.135.242:9901' +DEFAULT_BROKER = 'https://snowflake-reg.appspot.com/reg/test' DEFAULT_PORTS = http: 80 https: 443 @@ -207,15 +208,10 @@ Signalling = log = (msg) -> # Log to the message window. console.log msg - # Scroll to latest - if $msglog + if $msglog # Scroll to latest $msglog.value += msg + '\n' $msglog.scrollTop = $msglog.scrollHeight -welcome = -> - log '== snowflake browser proxy ==' - log 'Input desired relay address:' - init = -> $msglog = document.getElementById('msglog') $msglog.value = '' @@ -227,8 +223,11 @@ init = -> $input.focus() $input.onkeydown = (e) -> $send.onclick() if 13 == e.keyCode # enter + log '== snowflake browser proxy ==' snowflake = new Snowflake() window.snowflake = snowflake - welcome() + broker = new Broker DEFAULT_BROKER + broker.register() + log 'Input desired relay address:' window.onload = init if window

1 0

[tor-browser-bundle/master] Release preparations
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit 56c9e21c35d93e29d2750184fa44d23f46aef71c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 21 20:22:19 2016 +0000 Release preparations --- Bundle-Data/Docs/ChangeLog.txt | 49 +++++++++++++++++++++++++++++++++++++ gitian/versions | 32 ++++++++++-------------- tools/update-responses/config.yml | 12 ++++----- 3 files changed, 68 insertions(+), 25 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index dbb01bd..6042c2f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,52 @@ +Tor Browser 5.5 -- January 26 2016 + * All Platforms + * Update Firefox to 38.6.0esr + * Update libevent to 2.0.22-stable + * Update NoScript to 2.9.0.2 + * Update Torbutton to 1.9.4.3 + * Bug 16990: Show circuit display for connections using multi-party channels + * Bug 18019: Avoid empty prompt shown after non-en-US update + * Bug 18004: Remove Tor fundraising donation banner + * Bug 16940: After update, load local change notes + * Bug 17108: Polish about:tor appearance + * Bug 17568: Clean up tor-control-port.js + * Bug 16620: Move window.name handling into a Firefox patch + * Bug 17351: Code cleanup + * Translation updates + * Update Tor Launcher to 0.2.7.8 + * Bug 18113: Randomly permutate available default bridges of chosen type + * Bug 13313: Bundle a fixed set of fonts to defend against fingerprinting + * Bug 10140: Add new Tor Browser locale (Japanese) + * Bug 17428: Remove Flashproxy + * Bug 13512: Load a static tab with change notes after an update + * Bug 9659: Avoid loop due to optimistic data SOCKS code (fix of #3875) + * Bug 15564: Isolate SharedWorkers by first-party domain + * Bug 16940: After update, load local change notes + * Bug 17759: Apply whitelist to local fonts in @font-face (fix of #13313) + * Bug 17009: Shift and Alt keys leak physical keyboard layout (fix of #15646) + * Bug 17369: Disable RC4 fallback + * Bug 17442: Remove custom updater certificate pinning + * Bug 16620: Move window.name handling into a Firefox patch + * Bug 17220: Support math symbols in font whitelist + * Bug 10599+17305: Include updater and build patches needed for hardened builds + * Bug 18115+18102+18071+18091: Update/add new obfs4 bridge + * Bug 18072: Change recommended pluggable transport type to obfs4 + * Bug 18008: Create a new MAR Signing key and bake it into Tor Browser + * Bug 16322: Use onion address for DuckDuckGo search engine + * Bug 17917: Changelog after update is empty if JS is disabled + * Windows + * Bug 17250: Add localized font names to font whitelist + * Bug 16707: Allow more system fonts to get used on Windows + * Bug 13819: Ship expert bundles with console enabled + * Bug 17250: Fix broken Japanese fonts + * Bug 17870: Add intermediate certificate for authenticode signing + * OS X + * Bug 17122: Rename Japanese OS X bundle + * Bug 16707: Allow more system fonts to get used on OS X + * Bug 17661: Whitelist font .Helvetica Neue DeskInterface + * Linux + * Bug 16672: Don't use font whitelisting for Linux users + Tor Browser 5.5a6-hardened -- January 7 2016 * All Platforms * Update NoScript to 2.9 diff --git a/gitian/versions b/gitian/versions index 8e35391..7ff094e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -3,27 +3,25 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUNDLE_LOCALES_LINUX="ja" BUNDLE_LOCALES_WIN32="ja" BUNDLE_LOCALES_MAC="ja-JP-mac" - BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.2.0esr +FIREFOX_VERSION=38.6.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2 -TOR_TAG=tor-0.2.6.10 -TORLAUNCHER_TAG=0.2.7.7 -TORBUTTON_TAG=1.9.3.2 -HTTPSE_TAG=5.1.0 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 +TOR_TAG=tor-0.2.7.6 +TORLAUNCHER_TAG=0.2.7.8 +TORBUTTON_TAG=1.9.4.3 +HTTPSE_TAG=5.1.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 -LIBEVENT_TAG=release-2.0.21-stable +LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 -FLASHPROXY_TAG=1.6 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -38,12 +36,12 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-8 +GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux -OPENSSL_VER=1.0.1p +OPENSSL_VER=1.0.1q GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 PYTHON_VER=2.7.5 @@ -52,7 +50,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -63,7 +60,7 @@ NOTOCJKFONT_VER=1.004 ## 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.6.9.34-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.2-sm+fx+fn.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 @@ -78,7 +75,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -88,20 +84,19 @@ NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1 +OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=d17e3eeb8cc6ddc6c6cabd002184eced5c8cf061c9d337bac2085e7d2daceacd +NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -127,7 +122,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index d61793c..362c146 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,14 +10,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.5a6 - release: 5.0 + release: 5.5 versions: - 5.0: - platformVersion: 38.2.0 - detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/5.0 + 5.5: + platformVersion: 38.6.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-55-released + download_url: https://www.torproject.org/dist/torbrowser/5.5 incremental_from: - - 4.5.3 + - 5.0.7 migrate_archs: osx32: osx64 osx32:

1 0

[tor-launcher/maint-0.2.7] Version bump
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit 5cf4922eedbca64f956f0cc589701757f0b88680 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 21 14:41:57 2016 +0000 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index a7524b7..06ebe1a 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.7.7</em:version> + <em:version>0.2.7.8</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-launcher/maint-0.2.7] Bug 18113: Randomly permutate available default bridges of chosen type.
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit 99ea6908eace93472b72670abc1f0bc6c4f86dfa Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 21 03:37:43 2016 +0000 Bug 18113: Randomly permutate available default bridges of chosen type. * ADDS a new function to TorLauncherUtil, rearrangeBridges() which takes an array of items and returns a random permutation of that array. * CHANGE defaultBridges() getter to call this.rearrangeBridges() before returning the default bridges. This causing the ordering of the default bridges in the torrc to vary among clients, resulting in a more even distribution of clients to default bridges. --- src/modules/tl-util.jsm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index ac680a8..2ef4b15 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -242,6 +242,19 @@ let TorLauncherUtil = // Public } catch (e) {} }, + // Currently, this returns a random permutation of an array, bridgeArray. + // Later, we might want to change this function to weight based on the + // bridges' bandwidths. + rearrangeBridges: function(bridgeArray) + { + for (var j, x, i = bridgeArray.length; i; + j = parseInt(Math.random() * i), + x = bridgeArray[--i], + bridgeArray[i] = bridgeArray[j], + bridgeArray[j] = x); + return bridgeArray; + }, + get shouldStartAndOwnTor() { const kPrefStartTor = "extensions.torlauncher.start_tor"; @@ -341,6 +354,7 @@ let TorLauncherUtil = // Public bridgeArray.push(s); } } + this.rearrangeBridges(bridgeArray); return bridgeArray; } catch(e) {};

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 21 Jan '16

21 Jan '16

commit e72a9fc03f09b67edca2d1889e2ef005f8708769 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 21 19:15:54 2016 +0000 Update translations for tor-launcher-network-settings_completed --- tr/network-settings.dtd | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd index 0b05f9c..4856f80 100644 --- a/tr/network-settings.dtd +++ b/tr/network-settings.dtd @@ -6,33 +6,39 @@  -<!ENTITY torsettings.prompt "Tor ağına bağlanmadan önce, bu bilgisayarın Internet bağlantısı hakkında bilgi vermeniz gerekiyor."> +<!ENTITY torsettings.prompt "Tor ağına bağlanmadan önce, bu bilgisayarın İnternet bağlantısı hakkında bilgi vermeniz gerekiyor."> <!ENTITY torSettings.yes "Evet"> <!ENTITY torSettings.no "Hayır"> <!ENTITY torSettings.firstQuestion "Aşağıdakilerden hangisi durumunuzu en iyi açıklıyor?"> <!ENTITY torSettings.configurePrompt1 "Bu bilgisayarın İnternet bağlantısı sansürlü ya da vekil sunucu arkasında."> -<!ENTITY torSettings.configurePrompt2 "Köprü ve yerel vekil sunucu ayarlarını yapmam gerekiyor."> +<!ENTITY torSettings.configurePrompt2 "Tor ağına bağlanmadan önce köprü ya da yerel vekil sunucu ayarlarını yapmalıyım"> <!ENTITY torSettings.configure "Yapılandır"> -<!ENTITY torSettings.connectPrompt2 "Doğrudan Tor ağına bağlanmak istiyorum."> +<!ENTITY torSettings.connectPrompt2 "Tor ağı ile doğrudan bir bağlantı kurmak istiyorum."> <!ENTITY torSettings.connectPrompt3 "Bu çoğu durumda çalışır."> <!ENTITY torSettings.connect "Bağlan"> <!ENTITY torSettings.proxyPageTitle "Yerel Vekil Sunucu Ayarları"> -<!ENTITY torSettings.proxyQuestion "Bu bilgisayarın Internet'e erişmesi için bir yerel vekil sunucu kullanması gerekiyor mu?"> +<!ENTITY torSettings.proxyQuestion "Bu bilgisayarın İnternet'e erişmesi için bir yerel vekil sunucu kullanması gerekiyor mu?">  -<!ENTITY torSettings.proxyHelp "Bu soruyu nasıl yanıtlayacağınızı bilmiyorsanız, başka bir tarayıcıda İnternet ayarlarına bakarak bir yerel vekil sunucu kullanılıp kullanılmadığını görün."> +<!ENTITY torSettings.proxyExplanation1 "Çoğu durumda bir yerel vekil sunucu gerekmez. Ancak bir kurum, okul ya da üniversite ağından bağlanırken gerekli olabilir."> +<!ENTITY torSettings.proxyExplanation2 "Bu sorunun yanıtından emin değilseniz, farklı bir web tarayıcıdaki İnternet ayarlarına bakın ya da vekil sunucu kullanmanın gerekip gerekmediğini anlamak için sisteminizin ağ ayarlarına bakın."> <!ENTITY torSettings.enterProxy "Vekil sunucu ayarlarını girin."> <!ENTITY torSettings.bridgePageTitle "Tor Köprüleri Ayarları"> <!ENTITY torSettings.bridgeQuestion "İnternet Servis Sağlayıcınız (ISS) Tor Ağına olan bağlantıları engelliyor ya da sansürlüyor mu?"> -<!ENTITY torSettings.bridgeHelp "Bu soruyu nasıl yanıtlayacağınızı bilmiyorsanız, Hayır'ı seçin.  Evet'i seçerseniz, Tor Ağı bağlantılarının engellenmesini daha zor hale getiren, listelenmeyen aktarıcılar olan Tor Köprülerini ayarlamanız istenir."> +<!ENTITY torSettings.bridgeExplanation1 "Bu sorunun yanıtından emin değilseniz, Hayır seçin (bir köprü olmadan Tor ağına bağlanamıyorsanız, daha sonra ekleyebilirsiniz)."> +<!ENTITY torSettings.bridgeExplanation2 "Evet olarak seçerseniz, Tor Ağı bağlantılarını engellemeyi zorlaştıran listelenmemiş aktarıcılar olan Tor Köprülerini ayarlamanız istenir."> <!ENTITY torSettings.bridgeSettingsPrompt "Sağlanan köprüleri kullanabilir ya da özel köprüler edinip yazabilirsiniz.">  <!ENTITY torsettings.startingTor "Tor'un başlaması bekleniyor…"> <!ENTITY torsettings.restartTor "Tor'u Yeniden Başlat"> +<!ENTITY torsettings.reconfigTor "Yeniden Ayarla"> + +<!ENTITY torsettings.discardSettings.prompt "Tor Köprülerini ayarladınız ya da yerel vekil sunucu ayarlarını yazdınız.  Tor ağına doğrudan bağlanmak için bu ayarlar kaldırılmalıdır."> +<!ENTITY torsettings.discardSettings.proceed "Ayarları Kaldır ve Bağlan"> <!ENTITY torsettings.optional "İsteğe bağlı"> @@ -50,6 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "İzin Verilen Bağlantı Noktaları:"> <!ENTITY torsettings.useBridges.checkbox "İnternet Servis Sağlayıcım (ISS) Tor ağına olan bağlantıları engelliyor"> <!ENTITY torsettings.useBridges.default "Sağlanan köprüler ile bağlan"> +<!ENTITY torsettings.useBridges.note "Her bir köprü tipinde engellemeyi aşmak için farklı yöntemler kullanılır.  Bir köprü çalışmazsa farklı bir tanesini deneyin."> <!ENTITY torsettings.useBridges.type "Aktarım tipi:"> <!ENTITY torsettings.useBridges.custom "Özel köprüler yazın"> <!ENTITY torsettings.useBridges.label "Bir ya da birkaç köprü aktarıcısı yazın (her satıra bir tane).">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 21 Jan '16

21 Jan '16

commit 8f74d8f5bd8508b5cfc3e1f43a371557ef16068a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 21 19:15:50 2016 +0000 Update translations for tor-launcher-network-settings --- tr/network-settings.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd index a190388..4856f80 100644 --- a/tr/network-settings.dtd +++ b/tr/network-settings.dtd @@ -15,30 +15,30 @@ <!ENTITY torSettings.configurePrompt1 "Bu bilgisayarın İnternet bağlantısı sansürlü ya da vekil sunucu arkasında."> <!ENTITY torSettings.configurePrompt2 "Tor ağına bağlanmadan önce köprü ya da yerel vekil sunucu ayarlarını yapmalıyım"> <!ENTITY torSettings.configure "Yapılandır"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Tor ağı ile doğrudan bir bağlantı kurmak istiyorum."> <!ENTITY torSettings.connectPrompt3 "Bu çoğu durumda çalışır."> <!ENTITY torSettings.connect "Bağlan"> <!ENTITY torSettings.proxyPageTitle "Yerel Vekil Sunucu Ayarları"> <!ENTITY torSettings.proxyQuestion "Bu bilgisayarın İnternet'e erişmesi için bir yerel vekil sunucu kullanması gerekiyor mu?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Çoğu durumda bir yerel vekil sunucu gerekmez. Ancak bir kurum, okul ya da üniversite ağından bağlanırken gerekli olabilir."> +<!ENTITY torSettings.proxyExplanation2 "Bu sorunun yanıtından emin değilseniz, farklı bir web tarayıcıdaki İnternet ayarlarına bakın ya da vekil sunucu kullanmanın gerekip gerekmediğini anlamak için sisteminizin ağ ayarlarına bakın."> <!ENTITY torSettings.enterProxy "Vekil sunucu ayarlarını girin."> <!ENTITY torSettings.bridgePageTitle "Tor Köprüleri Ayarları"> <!ENTITY torSettings.bridgeQuestion "İnternet Servis Sağlayıcınız (ISS) Tor Ağına olan bağlantıları engelliyor ya da sansürlüyor mu?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Bu sorunun yanıtından emin değilseniz, Hayır seçin (bir köprü olmadan Tor ağına bağlanamıyorsanız, daha sonra ekleyebilirsiniz)."> +<!ENTITY torSettings.bridgeExplanation2 "Evet olarak seçerseniz, Tor Ağı bağlantılarını engellemeyi zorlaştıran listelenmemiş aktarıcılar olan Tor Köprülerini ayarlamanız istenir."> <!ENTITY torSettings.bridgeSettingsPrompt "Sağlanan köprüleri kullanabilir ya da özel köprüler edinip yazabilirsiniz.">  <!ENTITY torsettings.startingTor "Tor'un başlaması bekleniyor…"> <!ENTITY torsettings.restartTor "Tor'u Yeniden Başlat"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Yeniden Ayarla"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Tor Köprülerini ayarladınız ya da yerel vekil sunucu ayarlarını yazdınız.  Tor ağına doğrudan bağlanmak için bu ayarlar kaldırılmalıdır."> +<!ENTITY torsettings.discardSettings.proceed "Ayarları Kaldır ve Bağlan"> <!ENTITY torsettings.optional "İsteğe bağlı"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "İzin Verilen Bağlantı Noktaları:"> <!ENTITY torsettings.useBridges.checkbox "İnternet Servis Sağlayıcım (ISS) Tor ağına olan bağlantıları engelliyor"> <!ENTITY torsettings.useBridges.default "Sağlanan köprüler ile bağlan"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Her bir köprü tipinde engellemeyi aşmak için farklı yöntemler kullanılır.  Bir köprü çalışmazsa farklı bir tanesini deneyin."> <!ENTITY torsettings.useBridges.type "Aktarım tipi:"> <!ENTITY torsettings.useBridges.custom "Özel köprüler yazın"> <!ENTITY torsettings.useBridges.label "Bir ya da birkaç köprü aktarıcısı yazın (her satıra bir tane).">

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 21 Jan '16

21 Jan '16

commit 3fe5f1b7f666178f995d8409d241a9f1fbc8e6b9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 21 19:15:45 2016 +0000 Update translations for tor-launcher-progress_completed --- tr/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/progress.dtd b/tr/progress.dtd index 353bbbe..2b9b2b9 100644 --- a/tr/progress.dtd +++ b/tr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Durumu"> <!ENTITY torprogress.openSettings "Ayarları Aç"> <!ENTITY torprogress.heading "Tor ağına bağlanılıyor"> -<!ENTITY torprogress.pleaseWait "Lütfen Tor ağı ile bağlantı kurulana kadar bekleyin."> +<!ENTITY torprogress.pleaseWait "Lütfen Tor ağı ile bağlantı kurulurken bekleyin. Bu işlem bir kaç dakika sürebilir.">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 21 Jan '16

21 Jan '16

commit ac1a498a8ac53bb25c4ec8681073adaa7c359ea6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 21 19:15:41 2016 +0000 Update translations for tor-launcher-progress --- tr/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/progress.dtd b/tr/progress.dtd index e9d4e5c..2b9b2b9 100644 --- a/tr/progress.dtd +++ b/tr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Durumu"> <!ENTITY torprogress.openSettings "Ayarları Aç"> <!ENTITY torprogress.heading "Tor ağına bağlanılıyor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Lütfen Tor ağı ile bağlantı kurulurken bekleyin. Bu işlem bir kaç dakika sürebilir.">

1 0