September 2015 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Using build2
by gk＠torproject.org 19 Sep '15

19 Sep '15

commit 902927e05800f3faca72782e3d78daa7dd77a6ee Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 19 18:44:07 2015 +0000 Using build2 --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1d82c5d..a5e51f5 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -11,7 +11,7 @@ FIREFOX_VERSION=38.3.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build2 TOR_TAG=tor-0.2.7.2-alpha TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.4

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 19 Sep '15

19 Sep '15

commit a57665ff778db1fb2dbf0f42a379f5b54ebf43b1 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 19 18:40:38 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0ccc83d..09e8d4f 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -467,7 +467,4 @@ pref("font.name.serif.x-western", "Tinos, Georgia"); pref("font.name.serif.zh-CN", "Noto Sans CJK SC Regular"); pref("font.name.serif.zh-HK", "Noto Sans CJK SC Regular"); pref("font.name.serif.zh-TW", "Noto Sans CJK SC Regular"); - -#endif - #endif

1 0

[webwml/staging] Make it more clear how to donate
by sebastian＠torproject.org 19 Sep '15

19 Sep '15

commit 506ffe86228692a658ac806e2e5beec01273df41 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Sep 19 15:48:52 2015 +0200 Make it more clear how to donate --- donate/en/donate.wml | 2 +- images/paypal_logo.jpg | Bin 0 -> 19598 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index c0b857c..e77a600 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -109,7 +109,7 @@ Account</small> <input type="hidden" name="cancel_return" value="https://www.torproject.org/getinvolved/volunteer"> </div> <div style="text-align: center;"> - <input type="image" src="$(IMGROOT)/paypal_logo.gif" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"> + <input type="image" src="$(IMGROOT)/paypal_logo.jpg" height="55" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"> </div> </form> </div> diff --git a/images/paypal_logo.jpg b/images/paypal_logo.jpg new file mode 100644 index 0000000..ee9712c Binary files /dev/null and b/images/paypal_logo.jpg differ

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 18 Sep '15

18 Sep '15

commit 6cbfeb29629b7f67fa4c86559a4b374c8dd390d3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 18 22:46:06 2015 +0000 Update translations for torbutton-torbuttondtd --- lt/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lt/torbutton.dtd b/lt/torbutton.dtd index 7f380ce..1b36b9a 100644 --- a/lt/torbutton.dtd +++ b/lt/torbutton.dtd @@ -36,7 +36,7 @@ <!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Tikrinti ar yra Tor naršyklės atnaujinimų..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> +<!ENTITY torbutton.context_menu.cookieProtections "Slapukų apsaugos"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "Kopijuoti Tor nuorodą"> <!ENTITY torbutton.context_menu.copyTor.key "p"> @@ -174,7 +174,7 @@ <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite šriftų atvaizdavimo mechanizmas yra išjungtas."> <!ENTITY torbutton.prefs.sec_svg_desc "Kai kurie paveikslų tipai yra išjungti."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG paveikslai yra išjungti."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> +<!ENTITY torbutton.prefs.sec_js_https_desc "Pagal numatymą. JavaScript yra išjungtas visuose ne-HTTPS saituose."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> <!ENTITY torbutton.prefs.sec_high "Aukštas"> <!ENTITY torbutton.prefs.sec_all_js_desc "Pagal numatymą, Javascript yra išjungtas visose svetainėse.">

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 18 Sep '15

18 Sep '15

commit dd17d87ee9e3d833342a04a02704fcec497b6d21 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 18 22:45:06 2015 +0000 Update translations for gettor --- lt/gettor.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lt/gettor.po b/lt/gettor.po index 0b9e6d6..e1247ed 100644 --- a/lt/gettor.po +++ b/lt/gettor.po @@ -4,15 +4,16 @@ # # Translators: # brdr <evelinaorama(a)gmail.com>, 2015 +# Tautvydas Zukauskas <lordmu(a)linuxmail.org>, 2015 # TylQuest <tylquest(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2015-03-01 12:31+0000\n" -"Last-Translator: brdr <evelinaorama(a)gmail.com>\n" -"Language-Team: Lithuanian (http://www.transifex.com/projects/p/torproject/language/lt/)\n" +"PO-Revision-Date: 2015-09-18 22:26+0000\n" +"Last-Translator: Tautvydas Zukauskas <lordmu(a)linuxmail.org>\n" +"Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,7 +26,7 @@ msgstr "Sveiki, čia GetTor robotas." #: lib/gettor/i18n.py:29 msgid "Thank you for your request." -msgstr "" +msgstr "Dėkojame už jūsų prašymą." #: lib/gettor/i18n.py:31 msgid ""

1 0

[tor-browser/tor-browser-38.3.0esr-5.0-2] Bug 16906: Don't depend on Windows crypto DLLs
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit ac15e62dc45841a3a21f091fcfa3dc0e455ed637 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 17 11:15:41 2015 -0400 Bug 16906: Don't depend on Windows crypto DLLs If not building the Windows Maintenance Service, avoid a dependency on crypt32.dll and wintrust.dll. Also, avoid setting sUsingService inside the updater code; this ensures that all Maintenance Service related codepaths are skipped. --- toolkit/mozapps/update/common/moz.build | 7 +++++-- toolkit/mozapps/update/common/sources.mozbuild | 15 +++++++++------ toolkit/mozapps/update/updater/updater.cpp | 6 ++++++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/toolkit/mozapps/update/common/moz.build b/toolkit/mozapps/update/common/moz.build index a977b0f..4beb56a 100644 --- a/toolkit/mozapps/update/common/moz.build +++ b/toolkit/mozapps/update/common/moz.build @@ -12,13 +12,16 @@ EXPORTS += [ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXPORTS += [ - 'certificatecheck.h', 'pathhash.h', - 'registrycertificates.h', 'uachelper.h', 'updatehelper.cpp', 'updatehelper.h', ] + if CONFIG['MOZ_MAINTENANCE_SERVICE']: + EXPORTS += [ + 'certificatecheck.h', + 'registrycertificates.h', + ] Library('updatecommon') diff --git a/toolkit/mozapps/update/common/sources.mozbuild b/toolkit/mozapps/update/common/sources.mozbuild index 7ec1aff..6b8a9e3 100644 --- a/toolkit/mozapps/update/common/sources.mozbuild +++ b/toolkit/mozapps/update/common/sources.mozbuild @@ -6,16 +6,19 @@ sources = [] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': sources += [ - 'certificatecheck.cpp', 'pathhash.cpp', - 'registrycertificates.cpp', 'uachelper.cpp', 'updatehelper.cpp', ] - OS_LIBS += [ - 'crypt32', - 'wintrust', - ] + if CONFIG['MOZ_MAINTENANCE_SERVICE']: + sources += [ + 'certificatecheck.cpp', + 'registrycertificates.cpp', + ] + OS_LIBS += [ + 'crypt32', + 'wintrust', + ] sources += [ 'readstrings.cpp', diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 9a01203..31a5dac 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -129,7 +129,9 @@ static bool sUseHardLinks = true; #endif #ifdef XP_WIN +#ifdef MOZ_MAINTENANCE_SERVICE #include "registrycertificates.h" +#endif BOOL PathAppendSafe(LPWSTR base, LPCWSTR extra); BOOL PathGetSiblingFilePath(LPWSTR destinationBuffer, LPCWSTR siblingFilePath, @@ -2031,6 +2033,7 @@ LaunchWinPostProcess(const WCHAR *installationDir, return false; } +#ifdef MOZ_MAINTENANCE_SERVICE // TEST_UPDATER is not available on esr38 //#if !defined(TEST_UPDATER) if (sUsingService && @@ -2038,6 +2041,7 @@ LaunchWinPostProcess(const WCHAR *installationDir, return false; } //#endif +#endif WCHAR dlogFile[MAX_PATH + 1]; if (!PathGetSiblingFilePath(dlogFile, exefullpath, L"uninstall.update")) { @@ -2981,8 +2985,10 @@ int NS_main(int argc, NS_tchar **argv) const int callbackIndex = 6; #if defined(XP_WIN) +#ifdef MOZ_MAINTENANCE_SERVICE sUsingService = getenv("MOZ_USING_SERVICE") != nullptr; putenv(const_cast<char*>("MOZ_USING_SERVICE=")); +#endif // lastFallbackError keeps track of the last error for the service not being // used, in case of an error when fallback is not enabled we write the // error to the update.status file.

1 0

[webwml/staging] Merge remote-tracking branch 'origin/master' into staging
by sebastian＠torproject.org 18 Sep '15

18 Sep '15

commit 9aabcefb9a0d61b82344d9c9cfe83a0c1bdb86f7 Merge: b8ac55e 55334cd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Sep 18 18:25:37 2015 +0200 Merge remote-tracking branch 'origin/master' into staging press/en/press.wml | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[webwml/staging] update press clips
by sebastian＠torproject.org 18 Sep '15

18 Sep '15

commit 55334cdd62d76a7e78fba16582d5e6681e87a917 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Sep 17 00:43:54 2015 +0200 update press clips --- press/en/press.wml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/press/en/press.wml b/press/en/press.wml index 7cfeed5..4184b98 100644 --- a/press/en/press.wml +++ b/press/en/press.wml @@ -49,6 +49,11 @@ some of the significant Tor-related stories that have popped up.</p> <th>Topic</th> </tr> </thead> +<tr style=""> +<td>2015 Sep 16</td> +<td>Motherboard</td> +<td><a href="http://motherboard.vice.com/read/dissent-a-new-type-of-security-tool-could-…">'Dissent,' a New Type of Security Tool, Could Markedly Improve Online Anonymity</a></td> +</tr> <tr style="background-color: #e5e5e5;"> <td>2015 Sep 14</td> <td>Wired</td>

1 0

[webwml/staging] New donate page draft
by sebastian＠torproject.org 18 Sep '15

18 Sep '15

commit d24a0047603816177e091a1cf59e8011778cd558 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Sep 18 21:09:56 2015 +0200 New donate page draft --- css/layout.css | 1 - donate/en/donate.wml | 74 +++++++++++++++++----------------- en/navigation.wmi | 5 +++ images/paypal_logo.gif | Bin 0 -> 1916 bytes images/paypal_logo.png | Bin 0 -> 4196 bytes include/donatehead.wmi | 105 ++++++++++++++++++++++++++++++++++++++++++++++++ include/navigation.wmi | 5 +++ 7 files changed, 151 insertions(+), 39 deletions(-) diff --git a/css/layout.css b/css/layout.css index 54d225b..4908ee0 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1125,7 +1125,6 @@ small { .dbox.donate ul.amounts li { display: inline-block; - margin-left: 15px; } .dbox.donate ul.amounts li label { diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 39729d1..c0b857c 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -2,29 +2,32 @@ # Revision: $Revision$ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" +#include "donatehead.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" <div id="content" class="clearfix"> - <div id="breadcrumbs"> + <div id="maincol"> <h1>Make A Donation</h1> <p><strong>Your support is critical to our success.</strong> The - Tor Project is a US 501(c)(3) non-profit dedicated to research, - development, and education about online anonymity and privacy. Donations - to The Tor Project may be tax deductible to persons who are in the - US; or who pay taxes in countries with reciprocity with the US on - charitable donations. Our tax ID number is 20-8096820. We are listed on - <a href="http://www2.guidestar.org/organizations/20-8096820/tor-project.aspx">GuideStar</a>.</p> + Tor Project is a US non-profit organization dedicated to research, + development, and education about online anonymity and privacy. + </p>  <script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js"></script> <script type="text/javascript"> function displayVals() { + var radioVal = jQuery('input[@name="amount"]:checked').val(); + if (radioVal == 'other') { + jQuery('#amount').show(); + } else { + jQuery('#amount').val(""); + jQuery('#amount').hide(); + } var t3 = jQuery('#t3').val(); var amount = jQuery('#amount').val(); - var radioVal = jQuery('input[@name="amount"]:checked').val(); if(t3 != 0){ if( !amount ) { jQuery('#a3').val(radioVal); @@ -51,6 +54,7 @@ function displayVals() { jQuery(function(){ jQuery("input[@name='amount']:checked").change(displayVals); + jQuery("input[name='amount']").click(displayVals); jQuery("#amount").change(displayVals); jQuery("#t3").change(displayVals); displayVals(); @@ -59,12 +63,9 @@ jQuery(function(){ </script> <div class="hundred toptwenty"> - <a name="paypal"></a> - <h2>Donate via PayPal</h2> - <div class="dbox donate"> + <div class="dbox donate" style="text-align: center;"> <form id="donate" action="https://www.paypal.com/cgi-bin/webscr" method="post"> <p class="type"> - <label for="type">Donation Type:</label> <select id="t3" name="t3"> <option value="0">One-time Donation</option> <option value="M">Monthly Subscription</option> @@ -72,32 +73,27 @@ jQuery(function(){ <small id="ppinfo">Does Not Require a PayPal Account</small> </p> - <div class="drow"> - <div> - <input style="float: right;" type="image" src="$(IMGROOT)/paypal-donate-button.gif" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"> + <div class="drow" style="text-align: center;"> + <div style="text-align: center;"> <ul class="amounts"> - <li><input type="radio" class="radio" name="amount" value="5.00"><label for="5">5</label></li> - <li><input type="radio" class="radio" name="amount" value="10.00"><label for="10">10 </label></li> - <li><input type="radio" class="radio" name="amount" value="20.00"><label for="20">20 </label></li> - <li><input type="radio" class="radio" name="amount" value="50.00"><label for="50">50 </label></li> - <li><input type="radio" class="radio" name="amount" value="100.00" checked="checked"><label for="100">100 </label></li><br> - <li><input type="radio" class="radio" name="amount" value="250.00"><label for="250">250</label></li> - <li><input type="radio" class="radio" name="amount" value="500.00"><label for="500">500</label></li> - <li><input type="radio" class="radio" name="amount" value="1000.00"><label for="1000">1000</label></li> - <li><input type="text" id="amount" class="amount" name="amount"></li> <li> - <span> <select name="currency_code" class="cur"> <option value="USD" selected="selected">$</option> <option value="EUR">€</option> <option value="GBP">£</option> <option value="YEN">¥</option> </select> - </span> - </li> + </li> + <li><input type="radio" class="radio" name="amount" value="5.00"><label for="5">5 </label></li> + <li><input type="radio" class="radio" name="amount" value="23.00"><label for="23">23 </label></li> + <li><input type="radio" class="radio" name="amount" value="100.00" checked="checked"><label for="100">100 </label></li> + <li><input type="radio" class="radio" name="amount" value="256.00"><label for="256">256</label></li> + <li><input type="radio" class="radio" name="amount" value="500.00"><label for="500">500</label></li> + <li><input id="other" type="radio" class="radio" name="amount" value="other"><label for="other">other</label></li> + <li><input style="display: none;" type="text" id="amount" class="amount" name="amount"></li> </ul> </div> - <div> + <div style="text-align: center;"> <input type="hidden" id="a3" name="a3" value="0">  </div> @@ -112,21 +108,23 @@ Account</small> <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou"> <input type="hidden" name="cancel_return" value="https://www.torproject.org/getinvolved/volunteer"> </div> + <div style="text-align: center;"> + <input type="image" src="$(IMGROOT)/paypal_logo.gif" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"> + </div> </form> </div> </div>  - <div class="hundred toptwenty"> - <h2>Other options</h2> - We have many other donation and sponsorship <a href="<page donate/donate-options>">options</a> available. + <div class="hundred toptwenty" style="text-align: center;"> + <a href="<page donate/donate-options>">Other ways to donate</a> </div>  </div> - <div id = "sidecol"> -#include "side-donate.wmi" -#include "info.wmi" - </div> + +# include "side-donate.wmi" +# include "info.wmi" +   </div> -#include <foot.wmi> +# include <foot.wmi> diff --git a/en/navigation.wmi b/en/navigation.wmi index e90c8c8..ce8b001 100644 --- a/en/navigation.wmi +++ b/en/navigation.wmi @@ -14,6 +14,11 @@ '<blog>' , 'Blog', 'about/contact' , 'Contact', ); + my @donatenav = ( + 'index' , 'Home', + 'about/overview' , 'About Tor', + 'about/contact' , 'Contact', + ); my @calltoaction = ( 'download/download-easy' , 'Download', 'getinvolved/volunteer' , 'Volunteer', diff --git a/images/paypal_logo.gif b/images/paypal_logo.gif new file mode 100644 index 0000000..cd5f74b Binary files /dev/null and b/images/paypal_logo.gif differ diff --git a/images/paypal_logo.png b/images/paypal_logo.png new file mode 100644 index 0000000..aab877a Binary files /dev/null and b/images/paypal_logo.png differ diff --git a/include/donatehead.wmi b/include/donatehead.wmi new file mode 100644 index 0000000..5a371a3 --- /dev/null +++ b/include/donatehead.wmi @@ -0,0 +1,105 @@ +#! /usr/bin/wml +<: use strict; :> +<: use warnings; :> +#use "perl-globals.wmi" +#use "links.wmi" +#use "versions.wmi" +#use "navigation.wmi" + +<!DOCTYPE html> + <html> + <head> + + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="author" content="The Tor Project, Inc."> + <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> + <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg"> + + <title>$(TITLE)</title> + + <link rel="icon" href="$(IMGROOT)/favicon.ico"> + <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> + <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> + + # begin WML to generate css/js paths + <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">"> + <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.css" rel="stylesheet">"> + + #<link href="css/master.css" rel="stylesheet"> +  +  +  + # <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> + # end WML to generate css/js paths + +</head> +<body> +<div id="wrap"> + <div id="header"> + <h1 id="logo"><a href="<page index>">Tor</a></h1> + # navigation menu generation + <div id="nav"> + <ul> + <:{ + # create a hash and maintain order of keys + my %donatenav; + my @keys; + while (@donatenav) { + my $key = shift @donatenav; + my $val = shift @donatenav; + push @keys, $key; + $donatenav{$key} = $val; + } + + my $page = $WML_SRC_BASENAME; + my $lang = "$(LANG)"; + + for my $key (@keys) { + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + + # in directory of active link, set class active + my $class; + if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { + $class = 'class="active"'; + } else { + $class = ''; + } + + $dir = '.' unless defined $dir; + + # translated version + if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$donatenav{$key}; + } + # english version + elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $donatenav{$key}; + } + # full url + elsif ($key =~/^http/) { + printf '<li><a href="%s">%s</a></li>'."\n", $key, $donatenav{$key}; + } else { + warn "$WML_SRC_FILENAME has a [page $key] (parses to +docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; + } + } + }:> + </ul> + </div> +  + # end navigation generation + </div> +  + +#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>."> +#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>."> diff --git a/include/navigation.wmi b/include/navigation.wmi index a6c84a7..3cfec53 100644 --- a/include/navigation.wmi +++ b/include/navigation.wmi @@ -14,6 +14,11 @@ '<blog>' , 'Blog', 'about/contact' , 'Contact', ); + my @donatenav = ( + 'index' , 'Home', + 'about/overview' , 'About Tor', + 'about/contact' , 'Contact', + ); my @calltoaction = ( 'download/download-easy' , 'Download', 'getinvolved/volunteer' , 'Get Involved',

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit d55b90fbad7a81bdbee2d0131ac8e5c5712b3026 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 17 11:15:41 2015 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. If not building the Windows Maintenance Service, avoid a dependency on crypt32.dll and wintrust.dll. Also, avoid setting sUsingService inside the updater code; this ensures that all Maintenance Service related codepaths are skipped. --- toolkit/mozapps/update/common/moz.build | 7 +++++-- toolkit/mozapps/update/common/sources.mozbuild | 15 +++++++++------ toolkit/mozapps/update/updater/updater.cpp | 6 ++++++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/toolkit/mozapps/update/common/moz.build b/toolkit/mozapps/update/common/moz.build index a977b0f..4beb56a 100644 --- a/toolkit/mozapps/update/common/moz.build +++ b/toolkit/mozapps/update/common/moz.build @@ -12,13 +12,16 @@ EXPORTS += [ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXPORTS += [ - 'certificatecheck.h', 'pathhash.h', - 'registrycertificates.h', 'uachelper.h', 'updatehelper.cpp', 'updatehelper.h', ] + if CONFIG['MOZ_MAINTENANCE_SERVICE']: + EXPORTS += [ + 'certificatecheck.h', + 'registrycertificates.h', + ] Library('updatecommon') diff --git a/toolkit/mozapps/update/common/sources.mozbuild b/toolkit/mozapps/update/common/sources.mozbuild index 7ec1aff..6b8a9e3 100644 --- a/toolkit/mozapps/update/common/sources.mozbuild +++ b/toolkit/mozapps/update/common/sources.mozbuild @@ -6,16 +6,19 @@ sources = [] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': sources += [ - 'certificatecheck.cpp', 'pathhash.cpp', - 'registrycertificates.cpp', 'uachelper.cpp', 'updatehelper.cpp', ] - OS_LIBS += [ - 'crypt32', - 'wintrust', - ] + if CONFIG['MOZ_MAINTENANCE_SERVICE']: + sources += [ + 'certificatecheck.cpp', + 'registrycertificates.cpp', + ] + OS_LIBS += [ + 'crypt32', + 'wintrust', + ] sources += [ 'readstrings.cpp', diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 9a01203..31a5dac 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -129,7 +129,9 @@ static bool sUseHardLinks = true; #endif #ifdef XP_WIN +#ifdef MOZ_MAINTENANCE_SERVICE #include "registrycertificates.h" +#endif BOOL PathAppendSafe(LPWSTR base, LPCWSTR extra); BOOL PathGetSiblingFilePath(LPWSTR destinationBuffer, LPCWSTR siblingFilePath, @@ -2031,6 +2033,7 @@ LaunchWinPostProcess(const WCHAR *installationDir, return false; } +#ifdef MOZ_MAINTENANCE_SERVICE // TEST_UPDATER is not available on esr38 //#if !defined(TEST_UPDATER) if (sUsingService && @@ -2038,6 +2041,7 @@ LaunchWinPostProcess(const WCHAR *installationDir, return false; } //#endif +#endif WCHAR dlogFile[MAX_PATH + 1]; if (!PathGetSiblingFilePath(dlogFile, exefullpath, L"uninstall.update")) { @@ -2981,8 +2985,10 @@ int NS_main(int argc, NS_tchar **argv) const int callbackIndex = 6; #if defined(XP_WIN) +#ifdef MOZ_MAINTENANCE_SERVICE sUsingService = getenv("MOZ_USING_SERVICE") != nullptr; putenv(const_cast<char*>("MOZ_USING_SERVICE=")); +#endif // lastFallbackError keeps track of the last error for the service not being // used, in case of an error when fallback is not enabled we write the // error to the update.status file.

1 0