- tor-commits - lists.torproject.org

r24989: {website} fix the page link for the last press release. (website/trunk/press/en)
by Andrew Lewman 30 Aug '11

30 Aug '11

Author: phobos Date: 2011-08-30 04:10:05 +0000 (Tue, 30 Aug 2011) New Revision: 24989 Modified: website/trunk/press/en/press.wml Log: fix the page link for the last press release. Modified: website/trunk/press/en/press.wml =================================================================== --- website/trunk/press/en/press.wml 2011-08-30 04:08:09 UTC (rev 24988) +++ website/trunk/press/en/press.wml 2011-08-30 04:10:05 UTC (rev 24989) @@ -16,7 +16,7 @@ <h3>Press Releases</h3> <ul> <li>28 August 2011. The Tor Project announces a <a href="<page -press/2011-08-28-tor-022-stable">new stable release</a> of the Tor +press/2011-08-28-tor-022-stable>">new stable release</a> of the Tor software.</li> <li>16 September 2010. Tor announces an article discussing <a href="<page press/2010-09-16-ten-things-circumvention-tools>">Ten Things to Look

1 0

r24988: {website} link to the announcement from the press release. (website/trunk/press/en)
by Andrew Lewman 30 Aug '11

30 Aug '11

Author: phobos Date: 2011-08-30 04:08:09 +0000 (Tue, 30 Aug 2011) New Revision: 24988 Modified: website/trunk/press/en/2011-08-28-tor-022-stable.wml Log: link to the announcement from the press release. Modified: website/trunk/press/en/2011-08-28-tor-022-stable.wml =================================================================== --- website/trunk/press/en/2011-08-28-tor-022-stable.wml 2011-08-30 04:06:32 UTC (rev 24987) +++ website/trunk/press/en/2011-08-28-tor-022-stable.wml 2011-08-30 04:08:09 UTC (rev 24988) @@ -22,7 +22,10 @@ reliability, better compatibility for Android, correct behavior for bridges that listen on more than one address, more extensible and flexible directory object handling, better reporting of network statistics, -improved code security, and many many other features and bugfixes.</p> +improved code security, and many many other features and bugfixes. A +<a +href="https://lists.torproject.org/pipermail/tor-announce/2011-August/000080.html">full +changelog</a> is available.</p> <p>This release series is dedicated to the memory of Andreas Pfitzmann (1958-2010), a pioneer in anonymity and privacy research, a founder of the

1 0

r24987: {website} link the new release on the main page, add the press release (in website/trunk: en press/en)
by Andrew Lewman 30 Aug '11

30 Aug '11

Author: phobos Date: 2011-08-30 04:06:32 +0000 (Tue, 30 Aug 2011) New Revision: 24987 Modified: website/trunk/en/index.wml website/trunk/press/en/press.wml Log: link the new release on the main page, add the press release link as well. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2011-08-30 02:05:44 UTC (rev 24986) +++ website/trunk/en/index.wml 2011-08-30 04:06:32 UTC (rev 24987) @@ -189,6 +189,17 @@ <table> <tr> <td> + <div class="calendar"><span class="month">Aug</span><br><span class="day">28</span></div> + <p>The Tor Project announces a <a href="<page + press/2011-08-28-tor-022-stable>">new stable release</a> + of the Tor software. More than two years in the making, + this release features improved client performance and + hidden service reliability, better compatibility for + Android, correct behavior for bridges that listen on more + than one address, more extensible and flexible directory + object handling, better reporting of network statistics, + improved code security, and many many other features + and bugfixes.</p> <div class="calendar"><span class="month">Mar</span><br><span class="day">23</span></div> <p>The Tor Project wins the "Project of Social Benefit" award from the Free Software Foundation @@ -196,16 +207,6 @@ award and to be listed amongst the former winners. <a href="https://blog.torproject.org/blog/tor-project-receives-fsf-award">Read more</a> about this award.</p> - <div class="calendar"><span class="month">Feb</span><br><span class="day">23</span></div> - <p>The latest stable Tor version, 0.2.1.30, is <a - href="https://lists.torproject.org/pipermail/tor-announce/2011-February/000000.ht…">released</a>. - Tor 0.2.1.30 fixes a variety of less critical bugs. The - main other change is a slight tweak to Tor's TLS handshake - that makes relays and bridges that run this new version - reachable from Iran again. We don't expect this tweak - will win the arms race long-term, but it buys us time - until we roll out a better solution. - </p> </td> </tr> </table> Modified: website/trunk/press/en/press.wml =================================================================== --- website/trunk/press/en/press.wml 2011-08-30 02:05:44 UTC (rev 24986) +++ website/trunk/press/en/press.wml 2011-08-30 04:06:32 UTC (rev 24987) @@ -15,9 +15,17 @@ <h3>Press Releases</h3> <ul> -<li>16 September 2010. Tor announces an article discussing <a href="<page press/2010-09-16-ten-things-circumvention-tools>">Ten Things to Look for in a Circumvention Tool</a>.</li> -<li>25 March 2010. Tor and Printfection launch <a href="<page press/2010-03-25-tor-store-press-release>">The Tor Store</a>.</li> -<li>12 March 2009. Tor launches a <a href="<page press/2009-03-12-performance-roadmap-press-release>">performance roadmap</a> and campaign.</li> +<li>28 August 2011. The Tor Project announces a <a href="<page +press/2011-08-28-tor-022-stable">new stable release</a> of the Tor +software.</li> +<li>16 September 2010. Tor announces an article discussing <a href="<page +press/2010-09-16-ten-things-circumvention-tools>">Ten Things to Look +for in a Circumvention Tool</a>.</li> +<li>25 March 2010. Tor and Printfection launch <a href="<page +press/2010-03-25-tor-store-press-release>">The Tor Store</a>.</li> +<li>12 March 2009. Tor launches a <a href="<page +press/2009-03-12-performance-roadmap-press-release>">performance +roadmap</a> and campaign.</li> <li>19 December 2008. Tor announces 3-year <a href="<page press/2008-12-19-roadmap-press-release>">development roadmap</a>.</li> </ul>

1 0

r24986: {website} give tom?\195?\161s the rest of his name (website/trunk/about/en)
by Roger Dingledine 30 Aug '11

30 Aug '11

Author: arma Date: 2011-08-30 02:05:44 +0000 (Tue, 30 Aug 2011) New Revision: 24986 Modified: website/trunk/about/en/corepeople.wml Log: give tom?\195?\161s the rest of his name Modified: website/trunk/about/en/corepeople.wml =================================================================== --- website/trunk/about/en/corepeople.wml 2011-08-29 23:58:08 UTC (rev 24985) +++ website/trunk/about/en/corepeople.wml 2011-08-30 02:05:44 UTC (rev 24986) @@ -165,7 +165,7 @@ <dd>Works on the artwork and design for various projects, annual reports, and brochures. His other work can be found at <a href="http://jmtodaro.com/">http://jmtodaro.com/</a>.</dd> - <dt>Tomás Touced, Vidalia Developer</dt> + <dt>Tomás Touceda, Vidalia Developer</dt> <dd>Maintenance and new development for Vidalia.</dd> </dl>

1 0

r24985: {} stomp on the rest of the thankyou page. it is obsolete. (website/trunk/download/en)
by Roger Dingledine 29 Aug '11

29 Aug '11

Author: arma Date: 2011-08-29 23:58:08 +0000 (Mon, 29 Aug 2011) New Revision: 24985 Removed: website/trunk/download/en/thankyou.wml Log: stomp on the rest of the thankyou page. it is obsolete. Deleted: website/trunk/download/en/thankyou.wml =================================================================== --- website/trunk/download/en/thankyou.wml 2011-08-29 23:07:48 UTC (rev 24984) +++ website/trunk/download/en/thankyou.wml 2011-08-29 23:58:08 UTC (rev 24985) @@ -1,68 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low -#include "head.wmi" TITLE="Thank you for downloading Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" - <div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page download/download>">Download » </a> - <a href="<page download/thankyou>">Thank You</a> - </div> - - <h1>Thank you for downloading Tor!</h1> - <p><strong>Your download should begin automatically in a few seconds, but if not, you can download with our <a href="#">direct link</a>.</strong></p> - <div id="maincol-left"> - <div class="toptwenty"> - <div class="img-shadow"> - <div class="sidenav-sub"> - <h2>Need Help?</h2> - <ul> - <li class="dropdown"><a href="<page docs/installguide>">Read the Installation Guide</a></li> - <li class="dropdown"><a href="<page docs/faq>">Check out the FAQ</a></li> - <li class="dropdown"><a href="http://wiki.torproject.org">Read the Tor Wiki</a></li> - <li class="dropdown"><a href="#">Email our Technical Support</a></li> - </ul> - </div> - </div> -  - <div class="right"> - <div class="img-shadow"> - <div class="custom-infoblock"> - <h2>Is Your Installation Working?</h2> - <img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon"> - <h4>Use TorCheck to test your Install</h4> - <p>Visit <a href="http://check.torproject.org">check.torproject.org</a> to see if your install is working, and you’re being protected by the Tor onion router.</p> - </div> - </div> - </div> - </div> - </div> -  - <div id="sidecol-right"> - <div class="img-shadow"> - <div class="infoblock clearfix"> - <h2>Help Tor by Running a Relay</h2> - <p>We’re trying to reach 5,000 relays by 2011. Help support the Tor Project by <a href="<page docs/tor-doc-relay>">running your own</a>! It’s free and easy!</p> - <div class="fifty left toptwenty"> - <p class="small"><em>Current</em></p> - <p class="current-relay">3,542</p> - </div> - <div class="fifty left toptwenty"> - <p class="small"><em>Target</em></p> - <p class="target-relay">5,000</p> - </div> - </div> - </div> -  - <div class="img-shadow"> - <div class="infoblock"> - <h2 class="bulb">Tor Tip</h2> - <p>If you take a step towards online privacy by downloading Tor, that’s great, but remember that Tor can only be effective if you use the programs it’s developed for!</p> - </div> - </div> -  - </div> -  - </div> -  -#include <foot.wmi>

1 0

[torbrowser/master] give all platforms' vidalia.conf a DataDirectory so users don't accidentally configure auto port choosing and get bitten by Vidalia's inability to write a port.conf (see #3843)
by erinn＠torproject.org 29 Aug '11

29 Aug '11

commit 7f52d9f085536f178fed1a2541c38fb6a61bdcb3 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Aug 30 00:27:58 2011 +0100 give all platforms' vidalia.conf a DataDirectory so users don't accidentally configure auto port choosing and get bitten by Vidalia's inability to write a port.conf (see #3843) --- build-scripts/config/vidalia.conf.ff | 1 + build-scripts/config/vidalia.conf.ff-linux | 1 + build-scripts/config/vidalia.conf.ff-osx | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/vidalia.conf.ff b/build-scripts/config/vidalia.conf.ff index ef312a8..5875d2e 100644 --- a/build-scripts/config/vidalia.conf.ff +++ b/build-scripts/config/vidalia.conf.ff @@ -10,3 +10,4 @@ RunProxyAtStart=true ControlPort=9051 TorExecutable=.\\App\\tor.exe Torrc=.\\Data\\Tor\\torrc +DataDirectory=.\\Data\\Tor diff --git a/build-scripts/config/vidalia.conf.ff-linux b/build-scripts/config/vidalia.conf.ff-linux index 998be98..e9c5d06 100644 --- a/build-scripts/config/vidalia.conf.ff-linux +++ b/build-scripts/config/vidalia.conf.ff-linux @@ -7,3 +7,4 @@ LanguageCode=en ControlPort=9051 TorExecutable=./App/tor Torrc=./Data/Tor/torrc +DataDirectory=./Data/Tor diff --git a/build-scripts/config/vidalia.conf.ff-osx b/build-scripts/config/vidalia.conf.ff-osx index c038242..45f2d41 100644 --- a/build-scripts/config/vidalia.conf.ff-osx +++ b/build-scripts/config/vidalia.conf.ff-osx @@ -10,3 +10,4 @@ RunProxyAtStart=true ControlPort=9051 TorExecutable=../../Contents/MacOS/tor Torrc=../../Library/Vidalia/torrc +DataDirectory=../../Contents/Resources/Data/Tor

1 0

[torbrowser/maint-2.2] improve version string that goes into prefs.js by adding the build number, platform, and, if available, architecture
by erinn＠torproject.org 29 Aug '11

29 Aug '11

commit 60bcead14a1ac9f53dabfd1edf72a1377edfb822 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Aug 30 00:22:34 2011 +0100 improve version string that goes into prefs.js by adding the build number, platform, and, if available, architecture --- build-scripts/linux.mk | 8 +++++--- build-scripts/osx.mk | 6 ++++-- build-scripts/windows.mk | 8 +++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 904aed7..b32b258 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,6 +36,8 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) +BUILD_NUM=1 +PLATFORM=Linux ## Location of directory for source unpacking FETCH_DIR=/srv/build-trees/build-alpha-$(ARCH_TYPE) @@ -166,7 +168,7 @@ NAME=tor-browser DISTDIR=tbbl-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-1-alpha +VERSION=$(RELEASE_VER)-$(BUILD_NUM)-alpha DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION) @@ -468,6 +470,6 @@ update-extension-pref: sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Data/profile/prefs.js write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/App/Firefox/defaults/profile/prefs.js - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Data/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/App/Firefox/defaults/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/Data/profile/prefs.js diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 2e8b290..f1f62a6 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,6 +36,8 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 +BUILD_NUM=1 +PLATFORM=MacOS ## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-alpha-$(ARCH_TYPE) @@ -153,7 +155,7 @@ NAME=TorBrowser DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-1-alpha +VERSION=$(RELEASE_VER)-$(BUILD_NUM)-alpha DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) @@ -433,7 +435,7 @@ update-extension-pref: sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js final: mv $(BUNDLE) $(BUNDLE).app diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index da1384e..be4d957 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,6 +31,8 @@ ## Include versions include $(PWD)/versions.mk +BUILD_NUM=1 +PLATFORM=Windows ## Location of required libraries MING=/c/MinGW/bin @@ -138,7 +140,7 @@ NAME="Tor Browser" DISTDIR=tbbwin-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-1-alpha +VERSION=$(RELEASE_VER)-$(BUILD_NUM)-alpha DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) @@ -441,8 +443,8 @@ apply-prefs: cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js ## Export the source code of the bundle SRCNAME=$(COMPRESSED_NAME)

1 0

r24984: {} move the wmi file to the include/ directory (in website/trunk: download/en include)
by Roger Dingledine 29 Aug '11

29 Aug '11

Author: arma Date: 2011-08-29 23:07:48 +0000 (Mon, 29 Aug 2011) New Revision: 24984 Added: website/trunk/include/dlhead.wmi Removed: website/trunk/download/en/dlhead.wmi Log: move the wmi file to the include/ directory Deleted: website/trunk/download/en/dlhead.wmi =================================================================== --- website/trunk/download/en/dlhead.wmi 2011-08-29 23:07:06 UTC (rev 24983) +++ website/trunk/download/en/dlhead.wmi 2011-08-29 23:07:48 UTC (rev 24984) @@ -1,223 +0,0 @@ -#! /usr/bin/wml -<: use strict; :> -<: use warnings; :> -#use "perl-globals.wmi" -#use "links.wmi" -#use "versions.wmi" -#use "navigation.wmi" - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<html> -<head> - <title>$(TITLE)</title> - <link rel="shortcut icon" type="image/x-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)">"> - <ifeq "$(ANNOUNCE_RSS)" "yes" "<link rel="alternate" title="Tor Project OR-announce" href="http://rss.gmane.org/gmane.network.onion-routing.announce" -type="application/rss+xml">"> - - # begin WML to generate css/js paths - <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">"> - <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">"> - - #<link href="css/master.css" rel="stylesheet" type="text/css"> -  -  -  - -# <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> - # end WML to generate css/js paths - - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <meta name="author" content="The Tor Project, Inc."> - <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> - <script type="text/javascript" src="../js/jquery.min.js"> -# /* jQuery */ - </script> - <script type="text/javascript" src="../js/jquery.client.min.js"> -/* "jQuery Browser And OS Detection Plugin" by Stoimen - Source: http://www.stoimen.com/blog/2009/07/16/jquery-browser-and-os-detection-plug… - License: Public Domain (http://www.stoimen.com/blog/2009/07/16/jquery-browser-and-os-detection-plug…) */ - </script> - <script type="text/javascript" src="../js/dlpage01.js"> -# /* Displays detected section */ - </script> - <script async type="text/javascript" src="../js/jquery.accordion.min.js"> -/* Modified version of "Stupid Simple jQuery Accordian Menu" originally developed by Ryan Stemkoski - Source: http://www.stemkoski.com/stupid-simple-jquery-accordion-menu/ - License: Public Domain (http://www.stemkoski.com/stupid-simple-jquery-accordion-menu/#comment-32882) */ - </script> - <script async type="text/javascript"> -# /* switches package links depending on selection */ - function updateLang() { - var caller = $( this ); - var pkg = caller.attr('id'); - var lang = caller.val(); - var wintbb = '../dist/torbrowser/tor-browser-<version-torbrowserbundle>_'+lang+'.exe'; - var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-'+lang+'.zip'; - var lintbb32 = '../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-'+lang+'.tar.gz'; - var lintbb64 = '../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-'+lang+'.tar.gz'; - if(pkg == 'win-tbb'){ - $('.'+pkg).replaceWith('<a class="button win-tbb" href="'+wintbb+'"><span class="strong">Download</span><span class="normal">Tor Browser Bundle</span></a>'); - $('.'+pkg+'-sig').replaceWith('<a class="win-tbb-sig" href="'+wintbb+'.asc">sig</a>'); - }else if(pkg == 'osx-tbb'){ - $('.'+pkg).replaceWith('<a class="button osx-tbb" href="'+osxtbb+'"><span class="strong">Download</span><span class="normal">Tor Browser Bundle (Beta)</span></a>'); - $('.'+pkg+'-sig').replaceWith('<a class="osx-tbb-sig" href="'+osxtbb+'.asc">sig</a>'); - }else if(pkg == 'lin-tbb32'){ - $('.'+pkg).replaceWith('<a class="button lin-tbb32" href="'+lintbb32+'"><span class="strong">Download</span><span class="normal">i686 / 32-bit (Beta)</span></a>'); - $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb32-sig" href="'+lintbb32+'.asc">sig</a>'); - }else if(pkg == 'lin-tbb64'){ - $('.'+pkg).replaceWith('<a class="button lin-tbb64" href="'+lintbb64+'"><span class="strong">Download</span><span class="normal">x86_64 / 64-bit (Beta)</span></a>'); - $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb64-sig" href="'+lintbb64+'.asc">sig</a>'); - } - } - - $(function(){ - $('.lang').ready(updateLang); - $('.lang').change(updateLang); - /* Only show language selector if javascript is enabled */ - $('.lang').css('display', 'block'); - }); - </script> - <script async type="text/javascript"> - function displayVals() { - var t3 = $("#t3").val(); - var amount = $("#amount").val(); - if(t3 != 0){ - $('#a3').val(amount); - $('#p3').val(1); - $('#cmd').val('_xclick-subscriptions'); - $('#item_name').val('Tor Project Membership'); - $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>'); - }else{ - $('#a3').val(0); - $('#p3').val(0); - $('#cmd').val('_donations'); - $('#item_name').val('Donation to the Tor Project'); - $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } - if( !t3 ) { - $('#cmd').val('_donations'); - $('#item_name').val('Donation to the Tor Project'); - $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } - } - $(function(){ - $("#amount").change(displayVals); - $("#t3").change(displayVals); - displayVals(); - }); - </script> -</head> -<body onload="resetAll()" onunload=""> -<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 %navigation; - my @keys; - while (@navigation) { - my $key = shift @navigation; - my $val = shift @navigation; - push @keys, $key; - $navigation{$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)"),$navigation{$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"), $navigation{$key}; - } - # full url - elsif ($key =~/^http/) { - printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$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 id="calltoaction"> - <ul> - <:{ - my %calltoaction; - my @keys; - while (@calltoaction) { - my $key = shift @calltoaction; - my $val = shift @calltoaction; - push @keys, $key; - $calltoaction{$key} = $val; - } - - my $page = $WML_SRC_BASENAME; - my $lang = "$(LANG)"; - for my $key (@keys) { - my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; - - # in directory, set active - my $class; - if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { - #if ($WML_SRC_BASENAME eq $base) { - $class = 'class="active"'; - } else { - $class = ''; - } - - $dir = '.' unless defined $dir; - # try to use a translated version - if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { - printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", - stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key}; - } - # default to english version - elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { - printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", - stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$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> -  - </div> -  - -#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>."> -#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>."> Copied: website/trunk/include/dlhead.wmi (from rev 24980, website/trunk/download/en/dlhead.wmi) =================================================================== --- website/trunk/include/dlhead.wmi (rev 0) +++ website/trunk/include/dlhead.wmi 2011-08-29 23:07:48 UTC (rev 24984) @@ -0,0 +1,223 @@ +#! /usr/bin/wml +<: use strict; :> +<: use warnings; :> +#use "perl-globals.wmi" +#use "links.wmi" +#use "versions.wmi" +#use "navigation.wmi" + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> + <title>$(TITLE)</title> + <link rel="shortcut icon" type="image/x-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)">"> + <ifeq "$(ANNOUNCE_RSS)" "yes" "<link rel="alternate" title="Tor Project OR-announce" href="http://rss.gmane.org/gmane.network.onion-routing.announce" +type="application/rss+xml">"> + + # begin WML to generate css/js paths + <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">"> + <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">"> + + #<link href="css/master.css" rel="stylesheet" type="text/css"> +  +  +  + +# <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> + # end WML to generate css/js paths + + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <meta name="author" content="The Tor Project, Inc."> + <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> + <script type="text/javascript" src="../js/jquery.min.js"> +# /* jQuery */ + </script> + <script type="text/javascript" src="../js/jquery.client.min.js"> +/* "jQuery Browser And OS Detection Plugin" by Stoimen + Source: http://www.stoimen.com/blog/2009/07/16/jquery-browser-and-os-detection-plug… + License: Public Domain (http://www.stoimen.com/blog/2009/07/16/jquery-browser-and-os-detection-plug…) */ + </script> + <script type="text/javascript" src="../js/dlpage01.js"> +# /* Displays detected section */ + </script> + <script async type="text/javascript" src="../js/jquery.accordion.min.js"> +/* Modified version of "Stupid Simple jQuery Accordian Menu" originally developed by Ryan Stemkoski + Source: http://www.stemkoski.com/stupid-simple-jquery-accordion-menu/ + License: Public Domain (http://www.stemkoski.com/stupid-simple-jquery-accordion-menu/#comment-32882) */ + </script> + <script async type="text/javascript"> +# /* switches package links depending on selection */ + function updateLang() { + var caller = $( this ); + var pkg = caller.attr('id'); + var lang = caller.val(); + var wintbb = '../dist/torbrowser/tor-browser-<version-torbrowserbundle>_'+lang+'.exe'; + var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-'+lang+'.zip'; + var lintbb32 = '../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-'+lang+'.tar.gz'; + var lintbb64 = '../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-'+lang+'.tar.gz'; + if(pkg == 'win-tbb'){ + $('.'+pkg).replaceWith('<a class="button win-tbb" href="'+wintbb+'"><span class="strong">Download</span><span class="normal">Tor Browser Bundle</span></a>'); + $('.'+pkg+'-sig').replaceWith('<a class="win-tbb-sig" href="'+wintbb+'.asc">sig</a>'); + }else if(pkg == 'osx-tbb'){ + $('.'+pkg).replaceWith('<a class="button osx-tbb" href="'+osxtbb+'"><span class="strong">Download</span><span class="normal">Tor Browser Bundle (Beta)</span></a>'); + $('.'+pkg+'-sig').replaceWith('<a class="osx-tbb-sig" href="'+osxtbb+'.asc">sig</a>'); + }else if(pkg == 'lin-tbb32'){ + $('.'+pkg).replaceWith('<a class="button lin-tbb32" href="'+lintbb32+'"><span class="strong">Download</span><span class="normal">i686 / 32-bit (Beta)</span></a>'); + $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb32-sig" href="'+lintbb32+'.asc">sig</a>'); + }else if(pkg == 'lin-tbb64'){ + $('.'+pkg).replaceWith('<a class="button lin-tbb64" href="'+lintbb64+'"><span class="strong">Download</span><span class="normal">x86_64 / 64-bit (Beta)</span></a>'); + $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb64-sig" href="'+lintbb64+'.asc">sig</a>'); + } + } + + $(function(){ + $('.lang').ready(updateLang); + $('.lang').change(updateLang); + /* Only show language selector if javascript is enabled */ + $('.lang').css('display', 'block'); + }); + </script> + <script async type="text/javascript"> + function displayVals() { + var t3 = $("#t3").val(); + var amount = $("#amount").val(); + if(t3 != 0){ + $('#a3').val(amount); + $('#p3').val(1); + $('#cmd').val('_xclick-subscriptions'); + $('#item_name').val('Tor Project Membership'); + $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>'); + }else{ + $('#a3').val(0); + $('#p3').val(0); + $('#cmd').val('_donations'); + $('#item_name').val('Donation to the Tor Project'); + $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); + } + if( !t3 ) { + $('#cmd').val('_donations'); + $('#item_name').val('Donation to the Tor Project'); + $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); + } + } + $(function(){ + $("#amount").change(displayVals); + $("#t3").change(displayVals); + displayVals(); + }); + </script> +</head> +<body onload="resetAll()" onunload=""> +<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 %navigation; + my @keys; + while (@navigation) { + my $key = shift @navigation; + my $val = shift @navigation; + push @keys, $key; + $navigation{$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)"),$navigation{$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"), $navigation{$key}; + } + # full url + elsif ($key =~/^http/) { + printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$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 id="calltoaction"> + <ul> + <:{ + my %calltoaction; + my @keys; + while (@calltoaction) { + my $key = shift @calltoaction; + my $val = shift @calltoaction; + push @keys, $key; + $calltoaction{$key} = $val; + } + + my $page = $WML_SRC_BASENAME; + my $lang = "$(LANG)"; + for my $key (@keys) { + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + + # in directory, set active + my $class; + if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { + #if ($WML_SRC_BASENAME eq $base) { + $class = 'class="active"'; + } else { + $class = ''; + } + + $dir = '.' unless defined $dir; + # try to use a translated version + if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { + printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key}; + } + # default to english version + elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { + printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$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> +  + </div> +  + +#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>."> +#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>.">

1 0

r24983: {website} 0.2.1 is no longer the stable branch (website/trunk/download/en)
by Roger Dingledine 29 Aug '11

29 Aug '11

Author: arma Date: 2011-08-29 23:07:06 +0000 (Mon, 29 Aug 2011) New Revision: 24983 Modified: website/trunk/download/en/download.wml Log: 0.2.1 is no longer the stable branch Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-08-29 22:40:10 UTC (rev 24982) +++ website/trunk/download/en/download.wml 2011-08-29 23:07:06 UTC (rev 24983) @@ -215,8 +215,8 @@ <h2>Source Tarball</h2> <p> Configure with: <code style="color: #666666;">./configure && make && src/or/tor</code></p> - <p>The current stable version of Tor is <version-stable>. Its <a href="https://gitweb.torproject.org/tor.git/blob/release-0.2.1:/ChangeLog">release notes</a> are available.</p> - <p>The current unstable/alpha version of Tor is <version-alpha>. Its <a href="https://gitweb.torproject.org/tor.git/blob/refs/heads/release-0.2.2:/Change…">Changelog</a> is available.</p> + <p>The current stable version of Tor is <version-stable>. Its <a href="https://gitweb.torproject.org/tor.git/blob/release-0.2.2:/ReleaseNotes">release notes</a> are available.</p> + <p>The current unstable/alpha version of Tor is <version-alpha>. Its <a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/ChangeLog">Changelog</a> is available.</p> </div> </div>

1 0

[torbrowser/maint-2.2] remove spurious running processes check from linux tbbs. they are no longer needed since we have autoport configuration now.
by erinn＠torproject.org 29 Aug '11

29 Aug '11

commit cb7e4e5f01d2050696efd7687307c5dbb129e4c0 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 29 23:42:15 2011 +0100 remove spurious running processes check from linux tbbs. they are no longer needed since we have autoport configuration now. --- src/RelativeLink/RelativeLink.sh | 49 ++++++------------------------------- 1 files changed, 8 insertions(+), 41 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 1d2f4e3..579612c 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -173,48 +173,15 @@ export LD_LIBRARY_PATH DYLD_PRINT_LIBRARIES=1 export DYLD_PRINT_LIBRARIES -# if any relevant processes are running, inform the user and exit cleanly -RUNNING=0 -RUNNING_MESSAGE="" -for process in tor vidalia - # FIXME pidof isn't POSIX - do pid="`pidof $process`" - if [ -n "$pid" ]; then - RUNNING_MESSAGE="`printf "%s\n%s is already running as PID %s." "$RUNNING_MESSAGE" "$process" "$pid"`" - RUNNING=1 - fi - done - -if [ "$RUNNING" -eq 1 ]; then - complain "`printf "%s\n\nPlease shut down the above process(es) before running Tor Browser Bundle." "$RUNNING_MESSAGE"`" - exit 1 -fi - - if [ "${debug}" ]; then - if [ -n "${surveysays}" ]; then - printf "\nSurvey says: $surveysays\n\n" - fi - - # this is likely unportable to Mac OS X or other netstat binaries - for port in "8118" "9050" - do - BOUND="`netstat -tan 2>&1|grep 127.0.0.1":${port}[^:]"|grep -v TIME_WAIT`" - if [ "${BOUND}" ]; then - printf "\nLikely problem detected: It appears that you have something listening on ${port}\n" - printf "\nWe think this because of the following:\n${BOUND}\n" - fi - done - - printf "\nStarting Vidalia now\n" - cd "${HOME}" - printf "\nLaunching Vidalia from: `pwd`\n" - # XXX Someday we should pass whatever command-line arguments we got - # (probably filenames or URLs) to Firefox. - ./App/vidalia --loglevel debug --logfile vidalia-debug-log \ - --datadir Data/Vidalia/ - printf "\nVidalia exited with the following return code: $?\n" - exit + printf "\nStarting Vidalia now\n" + cd "${HOME}" + printf "\nLaunching Vidalia from: `pwd`\n" + # XXX Someday we should pass whatever command-line arguments we got + # (probably filenames or URLs) to Firefox. + ./App/vidalia --loglevel debug --logfile vidalia-debug-log \ + --datadir Data/Vidalia/ + printf "\nVidalia exited with the following return code: $?\n" fi # not in debug mode, run proceed normally

1 0