- tor-commits - lists.torproject.org

[tor-browser/tor-browser-38.6.0esr-5.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 04 Feb '16

04 Feb '16

commit 919b49a9cdf24a15cb8e637093555ef9bc396ac8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 4 09:15:10 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 18172: Back out the Windows related part as we need a better fix for it. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c022719..791e0d2 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -283,7 +283,7 @@ pref("font.name.sans-serif.ar", "Arial"); #endif #ifdef XP_WIN -pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Segoe UI Emoji, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); +pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); #endif #ifdef XP_LINUX

1 0

[snowflake/master] Begin embeddable snowflake badge (issue #16)
by serene＠torproject.org 04 Feb '16

04 Feb '16

commit 7677707249ef92d51a6f00236158a4fad62201ea Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 3 20:28:31 2016 -0800 Begin embeddable snowflake badge (issue #16) --- proxy/Cakefile | 6 ++++++ proxy/proxypair.coffee | 4 ++-- proxy/snowflake.coffee | 21 ++++++++++++--------- proxy/static/embed.html | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 11 deletions(-) diff --git a/proxy/Cakefile b/proxy/Cakefile index 499de94..fa37ce1 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -33,6 +33,12 @@ task 'test', 'snowflake unit tests', -> throw err if err console.log stdout + stderr +# task 'build:embed', 'build the snowflake badge', -> + # exec 'mkdir -p build' + # concatCoffeeFiles() + # copyStaticFiles() + # compileCoffee() + task 'build', 'build the snowflake proxy', -> exec 'mkdir -p build' concatCoffeeFiles() diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index ca9dcca..ac65ac5 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -59,7 +59,7 @@ class ProxyPair channel.onopen = => log 'Data channel opened!' snowflake.state = MODE.WEBRTC_READY - $msglog.className = 'active'; + $msglog.className = 'active' if $msglog # This is the point when the WebRTC datachannel is done, so the next step # is to establish websocket to the server. @connectRelay() @@ -67,7 +67,7 @@ class ProxyPair log 'Data channel closed.' Status.set 'disconnected.' snowflake.state = MODE.INIT - $msglog.className = '' + $msglog.className = '' if $msglog # Change this for multiplexing. snowflake.reset() channel.onerror = -> log 'Data channel error!' diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 99a9698..b59c35a 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -232,19 +232,22 @@ log = (msg) -> # Log to the message window. # Status bar Status = - set: (msg) -> $status.innerHTML = 'Status: ' + msg + set: (msg) -> + $status.innerHTML = 'Status: ' + msg if $status init = -> - $status = document.getElementById('status') - $msglog = document.getElementById('msglog') - $msglog.value = '' + $badge = document.getElementById('badge') + if !badge + $status = document.getElementById('status') + $msglog = document.getElementById('msglog') + $msglog.value = '' - $send = document.getElementById('send') - $send.onclick = Interface.acceptInput + $send = document.getElementById('send') + $send.onclick = Interface.acceptInput - $input = document.getElementById('input') - $input.focus() - $input.onkeydown = (e) -> $send.onclick() if 13 == e.keyCode # enter + $input = document.getElementById('input') + $input.focus() + $input.onkeydown = (e) -> $send.onclick() if 13 == e.keyCode # enter log '== snowflake browser proxy ==' log 'Copy-Paste mode detected.' if COPY_PASTE_ENABLED diff --git a/proxy/static/embed.html b/proxy/static/embed.html new file mode 100644 index 0000000..ae361c6 --- /dev/null +++ b/proxy/static/embed.html @@ -0,0 +1,35 @@ +<!doctype html> +<html> +<head> + <meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + <script type="text/javascript" src="snowflake.js"></script> + <style> + * { + box-sizing: border-box; + -webkit-transition: all 0.3s; + -moz-transition: all 0.3s; + transition: all 0.3s; + } + body { + position: absolute; + width: 100%; height: 100%; top: 0; margin: 0 auto; + background-color: #424; + color: #000; + text-align: center; + font-size: 16px; + font-variant: small-caps; + } + #badge { + margin: auto; + width: 88px; height: 31px; + background-image: url('koch.jpg'); + color: #fff; + } + </style> +</head> +<body> + <div id="badge"> + Snowflake + </div> +</body> +</html>

1 0

[snowflake/master] Move all DOM related stuff into ui.coffee
by serene＠torproject.org 04 Feb '16

04 Feb '16

commit caba2cc8f8600ce43c12822549c0e80b16688f6c Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 3 20:59:13 2016 -0800 Move all DOM related stuff into ui.coffee --- proxy/Cakefile | 9 ++------ proxy/proxypair.coffee | 8 +++---- proxy/snowflake.coffee | 61 +++++++++----------------------------------------- proxy/ui.coffee | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 62 deletions(-) diff --git a/proxy/Cakefile b/proxy/Cakefile index fa37ce1..fc92934 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -8,6 +8,7 @@ FILES = [ 'proxypair.coffee' 'websocket.coffee' 'broker.coffee' + 'ui.coffee' 'snowflake.coffee' ] FILES_TEST = [ @@ -33,12 +34,6 @@ task 'test', 'snowflake unit tests', -> throw err if err console.log stdout + stderr -# task 'build:embed', 'build the snowflake badge', -> - # exec 'mkdir -p build' - # concatCoffeeFiles() - # copyStaticFiles() - # compileCoffee() - task 'build', 'build the snowflake proxy', -> exec 'mkdir -p build' concatCoffeeFiles() @@ -54,4 +49,4 @@ task 'lint', 'ensure idiomatic coffeescript', -> task 'clean', 'remove all built files', -> exec 'rm -r build' - exec 'rm -r test' + exec 'rm -r test/snowflake.bundle.coffee' diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index ac65ac5..3c62d13 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -59,15 +59,15 @@ class ProxyPair channel.onopen = => log 'Data channel opened!' snowflake.state = MODE.WEBRTC_READY - $msglog.className = 'active' if $msglog + ui.setActive true # This is the point when the WebRTC datachannel is done, so the next step # is to establish websocket to the server. @connectRelay() channel.onclose = -> log 'Data channel closed.' - Status.set 'disconnected.' + ui.setStatus 'disconnected.' snowflake.state = MODE.INIT - $msglog.className = '' if $msglog + ui.setActive false # Change this for multiplexing. snowflake.reset() channel.onerror = -> log 'Data channel error!' @@ -80,7 +80,7 @@ class ProxyPair @relay.label = 'websocket-relay' @relay.onopen = => log '\nRelay ' + @relay.label + ' connected!' - Status.set 'connected' + ui.setStatus 'connected' @relay.onclose = @onClose @relay.onerror = @onError @relay.onmessage = @onRelayToClientMessage diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index b59c35a..60c2751 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -102,7 +102,7 @@ class Snowflake timer = null # Temporary countdown. countdown = (msg, sec) -> - Status.set msg + ' (Retrying in ' + sec + ' seconds...)' + ui.setStatus msg + ' (Retrying in ' + sec + ' seconds...)' sec-- if sec >= 0 setTimeout((-> countdown(msg, sec)), 1000) @@ -113,7 +113,7 @@ class Snowflake clearTimeout timer msg = 'polling for client... ' msg += '[retries: ' + @retries + ']' if @retries > 0 - Status.set msg + ui.setStatus msg recv = broker.getClientOffer() @retries++ recv.then (desc) => @@ -176,32 +176,8 @@ class Snowflake snowflake = null broker = null +ui = null -# -## -- DOM & Inputs -- # -# - -# DOM elements references. -$msglog = null -$send = null -$input = null -$status = null - -Interface = - # Local input from keyboard into message window. - acceptInput: -> - msg = $input.value - if !COPY_PASTE_ENABLED - log 'No input expected - Copy Paste Signalling disabled.' - else switch snowflake.state - when MODE.WEBRTC_CONNECTING - Signalling.receive msg - when MODE.WEBRTC_READY - log 'No input expected - WebRTC connected.' - else - log 'ERROR: ' + msg - $input.value = '' - $input.focus() # Signalling channel - just tells user to copy paste to the peer. # Eventually this should go over the broker. @@ -224,37 +200,20 @@ Signalling = return false snowflake.receiveOffer recv if desc -log = (msg) -> # Log to the message window. +# Log to both console and UI if applicable. +log = (msg) -> console.log msg - if $msglog # Scroll to latest - $msglog.value += msg + '\n' - $msglog.scrollTop = $msglog.scrollHeight - -# Status bar -Status = - set: (msg) -> - $status.innerHTML = 'Status: ' + msg if $status + ui.log msg init = -> - $badge = document.getElementById('badge') - if !badge - $status = document.getElementById('status') - $msglog = document.getElementById('msglog') - $msglog.value = '' - - $send = document.getElementById('send') - $send.onclick = Interface.acceptInput - - $input = document.getElementById('input') - $input.focus() - $input.onkeydown = (e) -> $send.onclick() if 13 == e.keyCode # enter - - log '== snowflake browser proxy ==' + ui = new UI() + log '== snowflake proxy ==' log 'Copy-Paste mode detected.' if COPY_PASTE_ENABLED brokerUrl = Params.getString(query, 'broker', DEFAULT_BROKER) broker = new Broker brokerUrl snowflake = new Snowflake(broker) - window.snowflake = snowflake + # window.snowflake = snowflake + # window.ui = ui relayAddr = Params.getAddress(query, 'relay', DEFAULT_RELAY) snowflake.setRelayAddr relayAddr diff --git a/proxy/ui.coffee b/proxy/ui.coffee new file mode 100644 index 0000000..eb54854 --- /dev/null +++ b/proxy/ui.coffee @@ -0,0 +1,61 @@ +### +All of Snowflake's DOM manipulation and inputs. +### + +class UI + debug = false # True when there's no badge + + # DOM elements references. + $msglog = null + $send = null + $input = null + $status = null + + constructor: -> + @$badge = document.getElementById('badge') + debug = !@$badge + return if !debug + + # Setup other DOM handlers if it's debug mode. + @$status = document.getElementById('status') + @$msglog = document.getElementById('msglog') + @$msglog.value = '' + + @$send = document.getElementById('send') + @$send.onclick = => { @acceptInput } + + @$input = document.getElementById('input') + @$input.focus() + @$input.onkeydown = (e) -> @$send.onclick() if 13 == e.keyCode # enter + + # Status bar + setStatus: (msg) => + return if !debug + @$status.innerHTML = 'Status: ' + msg + + setActive: (connected) => + if debug + @$msglog.className = if connected then 'active' else '' + else + # magic + + # Local input from keyboard into message window. + acceptInput: => + msg = @$input.value + if !COPY_PASTE_ENABLED + @log 'No input expected - Copy Paste Signalling disabled.' + else switch snowflake.state + when MODE.WEBRTC_CONNECTING + Signalling.receive msg + when MODE.WEBRTC_READY + @log 'No input expected - WebRTC connected.' + else + @log 'ERROR: ' + msg + @$input.value = '' + @$input.focus() + + log: (msg) => + return if !debug + # Scroll to latest + @$msglog.value += msg + '\n' + @$msglog.scrollTop = @$msglog.scrollHeight

1 0

[snowflake/master] Snowflake badge works, and animates when serving client (issue #16) and some logging cleanups
by serene＠torproject.org 04 Feb '16

04 Feb '16

commit 21c38a04ceac3cfa14dc932c979075c7b6cfbe76 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 3 21:37:21 2016 -0800 Snowflake badge works, and animates when serving client (issue #16) and some logging cleanups --- proxy/broker.coffee | 14 +++++++------- proxy/proxypair.coffee | 19 +++++++++---------- proxy/snowflake.coffee | 11 ++++++----- proxy/static/embed.html | 30 +++++++++++++++++++++--------- proxy/ui.coffee | 2 +- 5 files changed, 44 insertions(+), 32 deletions(-) diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 0f5c4ab..2cc39f7 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -24,7 +24,7 @@ class Broker constructor: (@url) -> @clients = 0 @id = genSnowflakeID() - log 'Contacting Broker at ' + @url + '\nSnowflake ID: ' + @id + dbg 'Contacting Broker at ' + @url + '\nSnowflake ID: ' + @id # Ensure url has the right protocol + trailing slash. @url = 'https://' + @url if 0 != @url.indexOf('https://', 0) @url += '/' if '/' != @url.substr -1 @@ -61,8 +61,8 @@ class Broker xhr.send @id sendAnswer: (answer) -> - log @id + ' - Sending answer back to broker...\n' - log answer.sdp + dbg @id + ' - Sending answer back to broker...\n' + dbg answer.sdp xhr = new XMLHttpRequest() try xhr.open 'POST', @url + 'answer' @@ -74,12 +74,12 @@ class Broker return if xhr.DONE != xhr.readyState switch xhr.status when STATUS_OK - log 'Broker: Successfully replied with answer.' - log xhr.responseText + dbg 'Broker: Successfully replied with answer.' + dbg xhr.responseText when STATUS_GONE - log 'Broker: No longer valid to reply with answer.' + dbg 'Broker: No longer valid to reply with answer.' else - log 'Broker ERROR: Unexpected ' + xhr.status + + dbg 'Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText Status.set ' failure. Please refresh.' xhr.send JSON.stringify(answer) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index 3c62d13..83dc353 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -32,16 +32,15 @@ class ProxyPair if null == evt.candidate # TODO: Use a promise.all to tell Snowflake about all offers at once, # once multiple proxypairs are supported. - log 'Finished gathering ICE candidates.' + dbg 'Finished gathering ICE candidates.' if COPY_PASTE_ENABLED Signalling.send @pc.localDescription else snowflake.broker.sendAnswer @pc.localDescription # OnDataChannel triggered remotely from the client when connection succeeds. @pc.ondatachannel = (dc) => - console.log dc channel = dc.channel - log 'Data Channel established...' + dbg 'Data Channel established...' @prepareDataChannel channel @client = channel @@ -52,19 +51,19 @@ class ProxyPair catch e log 'Invalid SDP message.' return false - log 'SDP ' + offer.type + ' successfully received.' + dbg 'SDP ' + offer.type + ' successfully received.' true prepareDataChannel: (channel) => channel.onopen = => - log 'Data channel opened!' + log 'WebRTC DataChannel opened!' snowflake.state = MODE.WEBRTC_READY ui.setActive true # This is the point when the WebRTC datachannel is done, so the next step # is to establish websocket to the server. @connectRelay() channel.onclose = -> - log 'Data channel closed.' + log 'WebRTC DataChannel closed.' ui.setStatus 'disconnected.' snowflake.state = MODE.INIT ui.setActive false @@ -75,11 +74,11 @@ class ProxyPair # Assumes WebRTC datachannel is connected. connectRelay: => - log 'Connecting to relay...' + dbg 'Connecting to relay...' @relay = makeWebsocket @relayAddr @relay.label = 'websocket-relay' @relay.onopen = => - log '\nRelay ' + @relay.label + ' connected!' + log @relay.label + ' connected!' ui.setStatus 'connected' @relay.onclose = @onClose @relay.onerror = @onError @@ -106,13 +105,13 @@ class ProxyPair onClose: (event) => ws = event.target - log(ws.label + ': closed.') + log ws.label + ' closed.' @flush() @maybeCleanup() onError: (event) => ws = event.target - log ws.label + ': error.' + log ws.label + ' error.' @close() # we can't rely on onclose_callback to cleanup, since one common error # case is when the client fails to connect and the relay never starts. diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 60c2751..a0cce74 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -118,7 +118,7 @@ class Snowflake @retries++ recv.then (desc) => offer = JSON.parse desc - log 'Received:\n\n' + offer.sdp + '\n' + dbg 'Received:\n\n' + offer.sdp + '\n' @receiveOffer offer , (err) -> countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000) @@ -133,7 +133,7 @@ class Snowflake sendAnswer: => next = (sdp) => - log 'webrtc: Answer ready.' + dbg 'webrtc: Answer ready.' @proxyPair.pc.setLocalDescription sdp promise = @proxyPair.pc.createAnswer next promise.then next if promise @@ -170,7 +170,7 @@ class Snowflake # Close all existing ProxyPairs and begin finding new clients from scratch. reset: -> @cease() - log '\nSnowflake resetting...' + log 'Snowflake resetting...' @retries = 0 @beginWebRTC() @@ -178,7 +178,6 @@ snowflake = null broker = null ui = null - # Signalling channel - just tells user to copy paste to the peer. # Eventually this should go over the broker. Signalling = @@ -202,9 +201,11 @@ Signalling = # Log to both console and UI if applicable. log = (msg) -> - console.log msg + console.log 'Snowflake: ' + msg ui.log msg +dbg = (msg) -> log msg if ui.debug + init = -> ui = new UI() log '== snowflake proxy ==' diff --git a/proxy/static/embed.html b/proxy/static/embed.html index ae361c6..c59809e 100644 --- a/proxy/static/embed.html +++ b/proxy/static/embed.html @@ -13,23 +13,35 @@ body { position: absolute; width: 100%; height: 100%; top: 0; margin: 0 auto; - background-color: #424; - color: #000; - text-align: center; - font-size: 16px; - font-variant: small-caps; + background-color: #424; color: #000; + font-size: 10px; letter-spacing: 1px; font-variant: small-caps; + text-align: center; cursor: default; + margin: 0; padding: 0; } #badge { - margin: auto; - width: 88px; height: 31px; + margin: auto; padding: 0; + width: 88px; height: 16px; background-image: url('koch.jpg'); - color: #fff; + text-shadow: 0 0 5px #fef; + font-weight: 900; + } + .active { + -webkit-animation: bgScroll 8s linear infinite; + animation: bgScroll 8s linear infinite; + } + @-webkit-keyframes bgScroll { + from {background-position: 49% -4%;} + to {background-position: 49% 104%;} + } + @keyframes bgScroll { + from {background-position: 49% -4%;} + to {background-position: 49% 104%;} } </style> </head> <body> <div id="badge"> - Snowflake + Internet Freedom </div> </body> </html> diff --git a/proxy/ui.coffee b/proxy/ui.coffee index eb54854..648a88e 100644 --- a/proxy/ui.coffee +++ b/proxy/ui.coffee @@ -37,7 +37,7 @@ class UI if debug @$msglog.className = if connected then 'active' else '' else - # magic + @$badge.className = if connected then 'active' else '' # Local input from keyboard into message window. acceptInput: =>

1 0

[tor/master] Revise some more changelog entries
by nickm＠torproject.org 04 Feb '16

04 Feb '16

commit 08788a81bc4ab3653e95bb8a7e727a28c53b7342 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 20:24:00 2016 -0500 Revise some more changelog entries --- ChangeLog | 31 +++++++++++++++++-------------- changes/bug17921_bug17984 | 4 ---- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44d4c88..7d55071 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,26 +86,29 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? that have them. Closes ticket 13696. o Minor features (accounting): - - Added two modes to AccountingRule in torrc for limiting just the - number of bytes sent ("AccountingRule out") or the number of bytes + - Added two modes to the AccountingRule option: One for limiting only + the number of bytes sent ("AccountingRule out"), and one for + limiting only the number of bytes received ("AccountingRule in"). Closes ticket 15989; patch from "unixninja92". o Minor features (build): - - Since our build process now uses 'make distcheck', we no longer + - Since our build process now uses "make distcheck", we no longer force "make dist" to depend on "make check". Closes ticket 17893; patch from "cypherpunks." - - Repair some compilation issues with some recent (unreleased, - alpha) versions of OpenSSL 1.1. Closes ticket 17549. + - Tor now builds successfully with the recent OpenSSL 1.1 + development branch, and with the latest LibreSSL. Closes tickets + 17549, 17921, and 17984. o Minor features (controller): - - Adds FallbackDir entries to 'GETINFO config/defaults'. Closes + - Adds the FallbackDir entries to 'GETINFO config/defaults'. Closes tickets 16774 and 17817. Patch by George Tankersley. - - New "GETINFO hs/service/desc/id/" command to retrieve a hidden + - New 'GETINFO hs/service/desc/id/' command to retrieve a hidden service descriptor from a service's local hidden service descriptor cache. Closes ticket 14846. - - Add controller getinfo exit-policy/reject-private/[default,relay] - for the reject rules added by ExitPolicyRejectPrivate. This makes + - Add 'GETINFO exit-policy/reject-private/[default,relay]', so + controllers can examine the + the reject rules added by ExitPolicyRejectPrivate. This makes it easier for stem to display exit policies. o Minor features (crypto): @@ -113,20 +116,20 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? George Tankersley. - Add SHA3 and SHAKE support to crypto.c. Closes ticket 17783. - When allocating a digest state object, allocate no more space than - we actually need. Previously, we were allocating as much space as + we actually need. Previously, we would allocate as much space as the state for the largest algorithm would need. This change saves up to 672 bytes per circuit. Closes ticket 17796. - Improve performance when hashing non-multiple of 8 sized buffers, - based on Andrew Moon's Public Domain SipHash-2-4 implementation. + based on Andrew Moon's public domain SipHash-2-4 implementation. Fixes bug 17544; bugfix on 0.2.5.3-alpha. o Minor features (directory downloads): - - Wait for busy authorities and fallbacks to become non-busy when + - Wait for busy authorities and fallback directories to become non-busy when bootstrapping. (A similar change was made in 6c443e987d for - directory servers chosen from the consensus.) Closes ticket 17864; + directory caches chosen from the consensus.) Closes ticket 17864; patch by "teor". - Add UseDefaultFallbackDirs, which enables any hard-coded fallback - directory mirrors. Default is 1, set it to 0 to disable fallbacks. + directory mirrors. The default is 1; set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor". o Minor features (geoip): diff --git a/changes/bug17921_bug17984 b/changes/bug17921_bug17984 deleted file mode 100644 index f254e29..0000000 --- a/changes/bug17921_bug17984 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (compilation): - - Tor builds successfully with the unreleased OpenSSL 1.1 alpha - releases, and with the latest LibreSSL. Closes tickets 17921 and - 17984.

1 0

[tor-browser-bundle/hardened-builds] Fix typo in bridges configuration
by gk＠torproject.org 03 Feb '16

03 Feb '16

commit 8503a7602b8123ac9a9900fd414accac2f67f86b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 3 18:06:37 2016 +0100 Fix typo in bridges configuration --- Bundle-Data/PTConfigs/bridge_prefs.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index adb5c98..8990c84 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -28,8 +28,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:41213 pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9”, "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10”, "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/master] Fix typo in bridges configuration
by gk＠torproject.org 03 Feb '16

03 Feb '16

commit 65398ba1a0c70640e749b7dc29d87d45129edbab Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 3 18:06:37 2016 +0100 Fix typo in bridges configuration --- Bundle-Data/PTConfigs/bridge_prefs.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index adb5c98..8990c84 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -28,8 +28,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:41213 pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9”, "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10”, "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tordnsel/master] sandboxed builds
by arlo＠torproject.org 03 Feb '16

03 Feb '16

commit 392bb98a397c1d5179c33befdd41a280f0525dfe Author: David Kaloper <david(a)numm.org> Date: Fri Aug 30 22:08:20 2013 +0200 sandboxed builds cabal >= 1.18 --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1efea40..84ca43d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ dist/ + .cabal-sandbox/ cabal.sandbox.config - +cabal.config

1 0

[tor-browser-bundle/maint-5.5] Fix typo in bridges configuration
by gk＠torproject.org 03 Feb '16

03 Feb '16

commit acf9efa76412e1fb5315b8859036928e503d96d0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 3 18:06:37 2016 +0100 Fix typo in bridges configuration --- Bundle-Data/PTConfigs/bridge_prefs.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index adb5c98..8990c84 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -28,8 +28,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:41213 pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9”, "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10”, "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tordnsel/master] Placate cpp-options warning
by arlo＠torproject.org 03 Feb '16

03 Feb '16

commit bd0cd7376c7fd03a5e1802a6c2da2774426518bc Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Feb 3 11:57:16 2016 -0800 Placate cpp-options warning --- tordnsel.cabal | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tordnsel.cabal b/tordnsel.cabal index 8780326..b51252d 100644 --- a/tordnsel.cabal +++ b/tordnsel.cabal @@ -59,7 +59,8 @@ Other-Modules: TorDNSEL.Config, HS-Source-Dirs: src Includes: sys/types.h, unistd.h, sysexits.h, netinet/in.h, openssl/rand.h Extra-Libraries: crypto -GHC-Options: -O2 -Wall -Werror -DVERSION="0.1.1-dev" +GHC-Options: -O2 -Wall -Werror +CPP-Options: -DVERSION="0.1.1-dev" Executable: runtests Buildable: False

1 0