- tbb-commits - lists.torproject.org

[torbutton/master] Bug 13891: Avoid undefined circuitStatuses/bridges
by gk＠torproject.org 12 Mar '15

12 Mar '15

commit bf2ee7eddab0eaed16ea6825ab084a6a183054f6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Mar 10 16:08:55 2015 -0700 Bug 13891: Avoid undefined circuitStatuses/bridges --- src/chrome/content/tor-circuit-display.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index b31953d..a4ba919 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -54,9 +54,11 @@ let trimQuotes = s => s ? s.match(/^\"(.*)\"$/)[1] : undefined; // is not currently used as a bridge, returns null. let getBridge = function* (controller, id) { let bridges = yield controller.getConf("bridge"); - for (let bridge of bridges) { - if (bridge.ID && bridge.ID.toUpperCase() === id.toUpperCase()) { - return bridge; + if (bridges) { + for (let bridge of bridges) { + if (bridge.ID && bridge.ID.toUpperCase() === id.toUpperCase()) { + return bridge; + } } } return null; @@ -107,11 +109,14 @@ let nodeDataForCircuit = function* (controller, circuitEvent) { // Returns the circuit status for the circuit with the given ID. let getCircuitStatusByID = function* (aController, circuitID) { let circuitStatuses = yield aController.getInfo("circuit-status"); - for (let circuitStatus of circuitStatuses) { - if (circuitStatus.id === circuitID) { - return circuitStatus; + if (circuitStatuses) { + for (let circuitStatus of circuitStatuses) { + if (circuitStatus.id === circuitID) { + return circuitStatus; + } } } + return null; }; // __collectIsolationData(aController)__.

1 0

[torbutton/master] Bug 14324: Show HS circuit in Tor circuit display
by gk＠torproject.org 12 Mar '15

12 Mar '15

commit c61487302e5056c561c7d50887807a320b354575 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Mar 10 21:44:41 2015 -0700 Bug 14324: Show HS circuit in Tor circuit display --- src/chrome/content/tor-circuit-display.js | 18 +++++++++++++----- src/chrome/locale/en/torbutton.properties | 2 ++ src/chrome/skin/tor-circuit-display.css | 5 +++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index fc4da14..b31953d 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -181,10 +181,9 @@ let showCircuitDisplay = function (show) { // Takes a nodeData array of node items, each like // `{ ip : "12.34.56.78", country : "fr" }` // and converts each node data to text, as -// `"France (12.34.56.78)"`, prepended by "This browser" -// and appended by "Internet". +// `"France (12.34.56.78)"`. let nodeLines = function (nodeData) { - let result = [uiString("this_browser")]; + let result = []; for (let {ip, countryCode, type, bridgeType} of nodeData) { let bridge = type === "bridge"; result.push( @@ -203,7 +202,6 @@ let nodeLines = function (nodeData) { // and right-to-left languages. " ‭ (" + (ip || uiString("ip_unknown")) + ")‬")); } - result.push(uiString("internet")); return result; }; @@ -225,6 +223,10 @@ let getSOCKSCredentialsForBrowser = function (browser) { return proxyInfo.username + ":" + proxyInfo.password; }; +// __onionSiteRelayLine__. +// When we have an onion site, we simply show the word '(relay)'. +let onionSiteRelayLine = "<li class='relay'>(" + uiString("relay") + ")</li>"; + // __updateCircuitDisplay()__. // Updates the Tor circuit display, showing the current domain // and the relay nodes for that domain. @@ -242,10 +244,16 @@ let updateCircuitDisplay = function () { document.getElementById("domain").innerHTML = "(" + domain + "):"; // Update the displayed information for the relay nodes. let lines = nodeLines(nodeData), - nodeInnerHTML = ""; + nodeInnerHTML = "<li>" + uiString("this_browser") + "</li>"; for (let line of lines) { nodeInnerHTML += "<li>" + line + "</li>"; } + nodeInnerHTML += domain.endsWith(".onion") ? + (onionSiteRelayLine + + onionSiteRelayLine + + onionSiteRelayLine + + "<li>" + uiString("onion_site") + "</li>") : + "<li>" + uiString("internet") + "</li>"; document.getElementById("circuit-nodes").innerHTML = nodeInnerHTML; } } diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 505f31b..3ee41f6 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -2,7 +2,9 @@ torbutton.button.tooltip.disabled = Enable Tor torbutton.button.tooltip.enabled = Disable Tor torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP unknown +torbutton.circuit_display.onion_site = Onion site torbutton.circuit_display.this_browser = This browser +torbutton.circuit_display.relay = relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Unknown country torbutton.panel.tooltip.disabled = Click to enable Tor diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index b9d0638..004a68f 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -104,3 +104,8 @@ ul#circuit-nodes li:first-child:before { ul#circuit-nodes li:last-child:before { height: 50%; } + +/* Onion site relay node text should be gray. */ +ul#circuit-nodes li.relay { + color: gray; +} \ No newline at end of file

1 0

[torbutton/master] Bug 15086: Handle RTL text in Tor circuit display
by gk＠torproject.org 12 Mar '15

12 Mar '15

commit 6d0c5e64ce8e104e3f9bfe648356a4f40fdde404 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Mar 1 17:04:48 2015 -0800 Bug 15086: Handle RTL text in Tor circuit display Also fixes #13704 (circuit display now accomodates more than 3 relays). --- src/chrome/content/popup.xul | 56 +++++++-------- src/chrome/content/tor-circuit-display.js | 41 +++++++---- src/chrome/skin/tor-circuit-display.css | 106 +++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+), 47 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index e0c1f74..6511b6c 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -1,18 +1,21 @@ <?xml version="1.0"?> <?xml-stylesheet href="chrome://torbutton/skin/torbutton.css" type="text/css"?> +<?xml-stylesheet href="chrome://torbutton/skin/tor-circuit-display.css" type="text/css"?> <!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> <overlay id="torbutton-popup-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - <stringbundleset id="torbutton-stringbundleset"> - <stringbundle id="torbutton-bundle" src="chrome://torbutton/locale/torbutton.properties"/> - </stringbundleset> - <panel id="torbutton-context-menu" onpopupshowing="torbutton_check_protections();" titlebar="normal" noautohide="true" - anchor="torbutton-button" position="after_start" > - <hbox align="start"> - <vbox> + <stringbundleset id="torbutton-stringbundleset"> + <stringbundle id="torbutton-bundle" src="chrome://torbutton/locale/torbutton.properties"/> + </stringbundleset> + <panel id="torbutton-context-menu" + onpopupshowing="torbutton_check_protections();" + titlebar="normal" noautohide="true" + anchor="torbutton-button" position="after_start" > + <hbox align="start"> + <vbox> <menuitem id="torbutton-new-identity" label="&torbutton.context_menu.new_identity;" accesskey="&torbutton.context_menu.new_identity_key;" @@ -45,29 +48,18 @@ accesskey="&torbutton.context_menu.downloadUpdate.key;" insertafter="context-stop" oncommand="torbutton_check_for_update()"/> - </vbox> - <vbox> -  - <svg xmlns="http://www.w3.org/2000/svg" version="1.1" baseProfile="full" - width="290" height="140" id="tor-circuit" style="display:none;"> - <rect x="0" y="0" width="100%" height="100%" fill="#e8f4f4" /> - <text id="title" style="font-size:14px;font-weight:bold;" x="10" y="20" fill="#2c26a7">&torbutton.circuit_display.title;</text> - <text id="domain" style="font-size:13px;" x="10" y="38" fill="black">(trac.torproject.org)</text> - <rect x="18.5" width="3" y="56" height="64" fill="#4d363a" stroke-width="0"/> - <circle class="node-circle" cx="20" cy="56" r="4" /> - <text class="node-text" x="32" y="56">This Browser</text> - <circle class="node-circle" cx="20" cy="72" r="4" /> - <text class="node-text" x="32" y="72">Test123 (54.67.87.34)</text> - <circle class="node-circle" cx="20" cy="88" r="4" /> - <text class="node-text" x="32" y="88">TestABC (121.4.56.67)</text> - <circle class="node-circle" cx="20" cy="104" r="4" /> - <text class="node-text" x="32" y="104">TestXYZ (74.3.30.9)</text> - <circle class="node-circle" cx="20" cy="120" r="4" /> - <text class="node-text" x="32" y="120">Internet</text> - </svg> - </vbox> - </hbox> - </panel> - + </vbox> + <vbox id="circuit-display-container"> + <div id="circuit-display" xmlns="http://www.w3.org/1999/xhtml" dir="auto"> + <p id="title">&torbutton.circuit_display.title;</p> + <p id="domain">(example.com)</p> + <ul id="circuit-nodes" dir="auto"> + <li>example A</li> + <li>example B</li> + <li>example C</li> + </ul> + </div> + </vbox> + </hbox> + </panel> </overlay> diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index bcda03a..fc4da14 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -173,26 +173,37 @@ let localizedCountryNameFromCode = function (countryCode) { // __showCircuitDisplay(show)__. // If show === true, makes the circuit display visible. let showCircuitDisplay = function (show) { - document.querySelector("svg#tor-circuit").style.display = show ? + document.getElementById("circuit-display-container").style.display = show ? 'block' : 'none'; }; // __nodeLines(nodeData)__. -// Takes a nodeData array of three items each like +// Takes a nodeData array of node items, each like // `{ ip : "12.34.56.78", country : "fr" }` // and converts each node data to text, as -// `"France (12.34.56.78)"`. +// `"France (12.34.56.78)"`, prepended by "This browser" +// and appended by "Internet". let nodeLines = function (nodeData) { let result = [uiString("this_browser")]; for (let {ip, countryCode, type, bridgeType} of nodeData) { let bridge = type === "bridge"; - result.push((countryCode ? localizedCountryNameFromCode(countryCode) + result.push( + // For each relay, show its apparent host country. + (countryCode ? localizedCountryNameFromCode(countryCode) : uiString("unknown_country")) + - " (" + (bridge ? (uiString("tor_bridge") + - ((bridgeType !== "vanilla") ? (": " + bridgeType) : "")) - : (ip || uiString("ip_unknown"))) + ")"); + (bridge ? + // As we have a bridge, don't show the IP address + // but show the bridge type. + " (" + uiString("tor_bridge") + + ((bridgeType !== "vanilla") ? (": " + bridgeType) : "") + ")" + : + // As we don't have a bridge, show the IP address + // of the node. Use unicode escapes to ensure that + // parentheses behave properly in both left-to-right + // and right-to-left languages. + " ‭ (" + (ip || uiString("ip_unknown")) + ")‬")); } - result[4] = uiString("internet"); + result.push(uiString("internet")); return result; }; @@ -215,7 +226,7 @@ let getSOCKSCredentialsForBrowser = function (browser) { }; // __updateCircuitDisplay()__. -// Updates the Tor circuit display SVG, showing the current domain +// Updates the Tor circuit display, showing the current domain // and the relay nodes for that domain. let updateCircuitDisplay = function () { let selectedBrowser = gBrowser.selectedBrowser; @@ -228,14 +239,14 @@ let updateCircuitDisplay = function () { if (nodeData) { // Update the displayed domain. let domain = credentials.split(":")[0]; - document.querySelector("svg#tor-circuit text#domain").innerHTML = "(" + domain + "):"; + document.getElementById("domain").innerHTML = "(" + domain + "):"; // Update the displayed information for the relay nodes. - let diagramNodes = document.querySelectorAll("svg#tor-circuit text.node-text"), - lines = nodeLines(nodeData); - for (let i = 0; i < diagramNodes.length; ++i) { - let line = lines[i]; - diagramNodes[i].innerHTML = line ? line : ""; + let lines = nodeLines(nodeData), + nodeInnerHTML = ""; + for (let line of lines) { + nodeInnerHTML += "<li>" + line + "</li>"; } + document.getElementById("circuit-nodes").innerHTML = nodeInnerHTML; } } // Only show the Tor circuit if we have credentials and node data. diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css new file mode 100644 index 0000000..b9d0638 --- /dev/null +++ b/src/chrome/skin/tor-circuit-display.css @@ -0,0 +1,106 @@ +/* +This CSS file is for styling the tor circuit display. It consists of a title, +a domain, and a bulleted list. + +Each bullet in the circuit node list is supposed to represent a Tor circuit node, +and lines drawn between them to represent Tor network inter-relay connections. + +CSS for line between bullets is Derived in part from https://jsfiddle.net/5JP8Q/ + +Color the background to make circuit display distinct from the rest of popup. +*/ + +/* The circuit-display div encloses all other HTML elements. */ +div#circuit-display { + background-color: #e8f4f4; + font-family: Arial; + width: 100%; + height: 100%; + padding: 8px; + /* Magically keep popup menu from clipping div: */ + display: table-cell; +} + +/* Format the title text. */ +div#circuit-display p#title { + font-size: 15px; + font-weight: bold; + color: #2c26a7; + margin: 0; +} + +/* Format the domain text. */ +div#circuit-display p#domain { + font-size: 13px; + color: black; + margin: 4px; +} + +/* Format the circuit node list. */ +ul#circuit-nodes { + font-family: Arial; + font-size: 14px; + margin-top: 8px; + padding-left: 8px; + padding-right: 8px; +} + +/* Hide default bullets, and position pseudoelements (our new bullets) relative + to the list items. */ +ul#circuit-nodes li { + list-style: none; + position:relative; +} + +/* Pad the list item text at left or right to be tastefully + separated from bullets. */ +ul#circuit-nodes li:-moz-dir(ltr) { + padding-left: 18px; +} +ul#circuit-nodes li:-moz-dir(rtl) { + padding-right: 18px; +} + +/* Drawn bullets, centered vertically for each list item. */ +ul#circuit-nodes li:after { + /* bullets */ + content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2711%27%20height%3D%2711%27%3E%3Ccircle%20cx%3D%275.5%27%20cy%3D%275.5%27%20r%3D%274%27%20style%3D%27stroke%3A%20%23195021%3B%20stroke-width%3A%202px%3B%20fill%3A%20white%3B%27%2F%3E%3C%2Fsvg%3E"); + position: absolute; + top: 1px; +} + +/* Move the bullets to the far left or right, + depending on text directionality. */ +ul#circuit-nodes li:-moz-dir(ltr):after { + left: 0px; +} +ul#circuit-nodes li:-moz-dir(rtl):after { + right: 0px; +} + +/* Draw a connecting vertical line through the bullets. */ +ul#circuit-nodes li:before { + content: ""; + position: absolute; + border-left: 3px solid #4d363a; + height: 100%; + width: 0px; +} + +/* Position lines through the middle of the bullet. */ +ul#circuit-nodes li:-moz-dir(ltr):before { + left: 4px; +} +ul#circuit-nodes li:-moz-dir(rtl):before { + right: 4px; +} + +/* Shorten the first list item's line so that it starts under the bullet. */ +ul#circuit-nodes li:first-child:before { + top: 50%; +} + +/* Shorten the last list item's line so that it ends under the bullet. */ +ul#circuit-nodes li:last-child:before { + height: 50%; +}

1 0

[tor-browser-bundle/master] Bug 15023: Adding Linux MAR tools to SHA256 sums
by gk＠torproject.org 10 Mar '15

10 Mar '15

commit 8fc54b8ab6e96ff8fc722066bc7756b25d23619f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 10 11:34:07 2015 +0000 Bug 15023: Adding Linux MAR tools to SHA256 sums --- gitian/mkbundle-linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index c71981f..f1ef984 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -257,7 +257,7 @@ then mkdir -p $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ cp -a build/out/tor-browser-linux*xz* $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 - #cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 cp -a inputs/*debug.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 touch inputs/bundle-linux.gbuilt else

1 0

[torbutton/master] Bug #15207: Check first if bridge.ID exists before using it
by gk＠torproject.org 10 Mar '15

10 Mar '15

commit 9714d5a8abfcc19c6c5667a8c4e3b7d064401df0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Mar 9 17:24:05 2015 -0700 Bug #15207: Check first if bridge.ID exists before using it --- src/chrome/content/tor-circuit-display.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index e2628b4..bcda03a 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -55,7 +55,7 @@ let trimQuotes = s => s ? s.match(/^\"(.*)\"$/)[1] : undefined; let getBridge = function* (controller, id) { let bridges = yield controller.getConf("bridge"); for (let bridge of bridges) { - if (bridge.ID.toUpperCase() === id.toUpperCase()) { + if (bridge.ID && bridge.ID.toUpperCase() === id.toUpperCase()) { return bridge; } }

1 0

[tor-browser-bundle/maint-4.0] Bug 14992: regenerate existing incremental MAR files
by boklm＠torproject.org 09 Mar '15

09 Mar '15

commit 9415032ccc373f96d3b7be4cf98ebe4d7bdf20e0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Mar 9 19:50:27 2015 +0100 Bug 14992: regenerate existing incremental MAR files --- tools/update-responses/update_responses | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index f982637..8b8c217 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -168,7 +168,7 @@ sub create_incremental_mar { $pm->finish; } -sub create_missing_incremental_mars_for_version { +sub create_incremental_mars_for_version { my ($config, $version) = @_; my $pm = Parallel::ForkManager->new(get_nbprocs); $pm->run_on_finish(sub { $_[2]->(@_) }); @@ -179,7 +179,6 @@ sub create_missing_incremental_mars_for_version { my $from_v = $config->{versions}{$from_version}; foreach my $os (keys %{$v->{files}}) { foreach my $lang (keys %{$v->{files}{$os}}) { - next if defined $v->{files}{$os}{$lang}{partial}{$from_version}; next unless defined $from_v->{files}{$os}{$lang}{complete}; create_incremental_mar($config, $pm, $from_version, $version, $os, $lang); } @@ -451,7 +450,7 @@ my %actions = ( check_deps; foreach my $version (channel_to_version($config, @ARGV)) { get_version_files($config, $version); - create_missing_incremental_mars_for_version($config, $version); + create_incremental_mars_for_version($config, $version); } }, check_update_responses_deployement => \&check_update_responses,

1 0

[tor-browser-bundle/master] Bug 14992: regenerate existing incremental MAR files
by boklm＠torproject.org 09 Mar '15

09 Mar '15

commit 010d6f55a4060b0dbb8e0c779f857bb35fbf0f36 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Mar 9 19:50:27 2015 +0100 Bug 14992: regenerate existing incremental MAR files --- tools/update-responses/update_responses | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index f982637..8b8c217 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -168,7 +168,7 @@ sub create_incremental_mar { $pm->finish; } -sub create_missing_incremental_mars_for_version { +sub create_incremental_mars_for_version { my ($config, $version) = @_; my $pm = Parallel::ForkManager->new(get_nbprocs); $pm->run_on_finish(sub { $_[2]->(@_) }); @@ -179,7 +179,6 @@ sub create_missing_incremental_mars_for_version { my $from_v = $config->{versions}{$from_version}; foreach my $os (keys %{$v->{files}}) { foreach my $lang (keys %{$v->{files}{$os}}) { - next if defined $v->{files}{$os}{$lang}{partial}{$from_version}; next unless defined $from_v->{files}{$os}{$lang}{complete}; create_incremental_mar($config, $pm, $from_version, $version, $os, $lang); } @@ -451,7 +450,7 @@ my %actions = ( check_deps; foreach my $version (channel_to_version($config, @ARGV)) { get_version_files($config, $version); - create_missing_incremental_mars_for_version($config, $version); + create_incremental_mars_for_version($config, $version); } }, check_update_responses_deployement => \&check_update_responses,

1 0

[tor-browser-bundle/master] Bug 15023: Build MAR tools archive deterministically.
by gk＠torproject.org 09 Mar '15

09 Mar '15

commit bc8eb2befd19fd13798f9a0527b2fa821555408e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Mar 6 16:38:48 2015 -0500 Bug 15023: Build MAR tools archive deterministically. Use dzip.sh to create the mar-tools-*.zip files. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-firefox.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index a1abf2e..3a144ca 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -154,7 +154,7 @@ script: | cp -p obj-*/dist/bin/$LIB $MARTOOLS/ done cd ~/build - zip -r mar-tools-linux${GBUILD_BITS}.zip mar-tools + ~/build/dzip.sh mar-tools-linux${GBUILD_BITS}.zip mar-tools cp -p mar-tools-linux${GBUILD_BITS}.zip $OUTDIR/ # # Strip and generate debuginfo for the firefox binary that we keep, all *.so diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 9126f03..f609268 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -92,7 +92,7 @@ script: | cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd ~/build - zip -r mar-tools-mac${GBUILD_BITS}.zip mar-tools + ~/build/dzip.sh mar-tools-mac${GBUILD_BITS}.zip mar-tools cp -p mar-tools-mac${GBUILD_BITS}.zip $OUTDIR/ # cd $INSTDIR diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 07c082b..c5f2c41 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -116,7 +116,7 @@ script: | cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd ~/build - zip -r mar-tools-win32.zip mar-tools + ~/build/dzip.sh mar-tools-win32.zip mar-tools cp mar-tools-win32.zip $OUTDIR/ # Making the .ja files deterministic and grabbing the results

1 0

[torbutton/master] Bug 15085: Fix about:tor RTL text alignment problems.
by brade＠torproject.org 04 Mar '15

04 Mar '15

commit 31b174a2ca518663d756bcb7aff92be119eefb58 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Mar 4 14:56:51 2015 -0500 Bug 15085: Fix about:tor RTL text alignment problems. --- src/chrome/locale/ar/aboutTor.dtd | 2 +- src/chrome/locale/fa/aboutTor.dtd | 2 +- src/chrome/skin/aboutTor.css | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index 4ab6609..da6be21 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -44,6 +44,6 @@ <!ENTITY aboutTor.helpInfo5.label "تبرع »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "مشروع تور هو US 501(c)(3) غير ربحي مُكرس للبحث، و التطوير، و التوعية بإخفاء الهوية والخصوصية."> +<!ENTITY aboutTor.footer.label "مشروع تور هو ‭US 501(c)(3)‬ غير ربحي مُكرس للبحث، و التطوير، و التوعية بإخفاء الهوية والخصوصية."> <!ENTITY aboutTor.learnMore.label "تعلم المزيد عن مشروع تور »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index a7bd20f..aaa04be 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -44,6 +44,6 @@ <!ENTITY aboutTor.helpInfo5.label "اهدا كنيد »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "پروژهٔ تور سازمان غیر انتفاعی آمریکایی 501(c)3 مختص پژوهش, توسعه و آموزش در زمین ناشناسی و حریم شخصی آنلاين هست."> +<!ENTITY aboutTor.footer.label "پروژهٔ تور سازمان غیر انتفاعی آمریکایی ‭501(c)(3)‬ مختص پژوهش, توسعه و آموزش در زمین ناشناسی و حریم شخصی آنلاين هست."> <!ENTITY aboutTor.learnMore.label "اطلاعات بیشتر در پروژهٔ تور كسب كنيد"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 0c12374..1342404 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -224,6 +224,10 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { text-align: left; } +#middle p:-moz-dir(rtl) { + text-align: right; +} + #middle a { font-size: 1.35em; } @@ -238,6 +242,11 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { padding: 5px 0 0 22px; } +#middle ul:-moz-dir(rtl) { + text-align: right; + padding: 5px 22px 0 0; +} + #middle li { padding-top: 2px; }

1 0

[tor-browser-bundle/master] Update NoScript to 2.6.9.15.
by mikeperry＠torproject.org 20 Feb '15

20 Feb '15

commit aa080184ec1c8101f719c9245e679a7b1dde99dd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 20 12:05:51 2015 -0800 Update NoScript to 2.6.9.15. --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- gitian/versions.alpha | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5998b60..0734bc9 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 4.5a4 -- Feb 24 2015 * Update Firefox to 31.5.0esr * Update Tor to 0.2.6.3-alpha * Update OpenSSL to 1.0.1l - * Update NoScript to 2.6.9.14 + * Update NoScript to 2.6.9.15 * Update obfs4proxy to 0.0.4 * Use obfs4proxy for ScrambleSuit bridges * Update Torbutton to 1.9.0.0 @@ -50,7 +50,7 @@ Tor Browser 4.0.4 -- Feb 24 2015 * All Platforms * Update Firefox to 31.5.0esr * Update OpenSSL to 1.0.1l - * Update NoScript to 2.6.9.14 + * Update NoScript to 2.6.9.15 * Update HTTPS-Everywhere to 4.0.3 * Bug 14203: Prevent meek from displaying an extra update notification * Bug 14849: Remove new NoScript menu option to make permissions permanent diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1f8b145..0f49a23 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -57,7 +57,7 @@ GO_VER=1.3.3 ## 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.14-fn+fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.15-sm+fn+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -86,7 +86,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=67516200ef6ec7a3741a2b94d2257edd91f1862cec92c89251ea870839f8032f +NOSCRIPT_HASH=63d866458e0261d20b612193f8f446728c991dd488c59e49d8f927c63e7eb9b4 HTTPSE_HASH=a42812dbd4b0103600ac5dce0e5f1366e8a7a7267e18743f5cd1e152615964e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0