August 2011 - tor-commits - lists.torproject.org

r24978: {} pre-stage the press release about 0.2.2.32. (website/trunk/press/en)
by Andrew Lewman 29 Aug '11

29 Aug '11

Author: phobos Date: 2011-08-29 21:46:02 +0000 (Mon, 29 Aug 2011) New Revision: 24978 Added: website/trunk/press/en/2011-08-28-tor-022-stable.wml Log: pre-stage the press release about 0.2.2.32. Added: website/trunk/press/en/2011-08-28-tor-022-stable.wml =================================================================== --- website/trunk/press/en/2011-08-28-tor-022-stable.wml (rev 0) +++ website/trunk/press/en/2011-08-28-tor-022-stable.wml 2011-08-29 21:46:02 UTC (… [View More]rev 24978) @@ -0,0 +1,88 @@ +## translation metadata +# Revision: $Revision: 24667 $ +# Translation-Priority: 4-optional + +#include "head.wmi" TITLE="The Tor Project announces a new stable release of Tor" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> + <a href="<page press/press>">Press » </a> + <a href="<page press/2011-08-28-tor-022-stable>">The Tor Project announces a new stable release of Tor</a> + </div> + <div id="maincol"> + + +<h2>FOR IMMEDIATE RELEASE</h2> + +<h2><strong>TOR PROJECT ANNOUNCES NEW STABLE RELEASE</strong></h2> + +<p><strong>WALPOLE, MA</strong> The Tor Project announces a new stable +release 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> + +<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 +PETS community, a leader in our field, a mentor, and a friend. He left +us with these words: +<blockquote>"I had the possibility to contribute to this world that +is not as it should be. I hope I could help in some areas to make the +world a better place, and that I could also encourage other people to +be engaged in improving the world. Please, stay engaged. This world +needs you, your love, your initiative -- now I cannot be part of that +anymore."</blockquote></p> + +<p>Tor's tools and technologies are already used by millions of people +to protect their activities online. These users include journalists and +human rights workers in politically rigid countries communicating with +whistleblowers and dissidents. Law enforcement officers on Internet +sting operations stay anonymous with Tor, as do people wanting to post +socially sensitive information in chat rooms, like rape or abuse survivors +and those with illnesses. The Tor network also provides protection +for people looking for another layer of privacy from the millions of +websites and ISPs bent on collecting private information and tracking +their moves online.</p> + +<p>Pre-compiled and configured versions of Tor can be found on <a +href="<page download/download>">the download page</a>.</p> + +<h2>ABOUT THE TOR PROJECT</h2> + +<p>Based in Walpole, MA, The Tor Project develops free and open-source +software that provides online anonymity to the everyday Internet +user. Tor was born out of a collaboration with the U.S. Naval Research +Lab starting in 2001, and it became an official U.S. 501(c)(3) non-profit +in 2006. The Tor Project now works with many individuals, NGOs, law +enforcement agencies, and businesses globally to help them protect their +anonymity online.</p> + +<p>In addition to its efforts developing and maintaining the Tor anonymity +software and the Tor network, The Tor Project also helps to lead the +research community in understanding how to build and measure scalable and +secure anonymity networks. The Tor developers publish several new research +papers each year in major academic security conferences, and just about +every major security conference these days includes a Tor-related paper. +Tor is a project-funded organization with a staff of 15.</p> + +<p>The "Onion Logo" and "Tor" wordmark are registered trademarks +of The Tor Project, Inc.</p> + +<p>Contact: Andrew Lewman</p> +<p>Tel: +1-781-352-0568</p> +<p>Email: execdir(a)torproject.org</p> +<p><a href="https://www.torproject.org/">Website: Tor Project</a></p> +<div align=center>###</div> + +</div> +  + <div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi> Property changes on: website/trunk/press/en/2011-08-28-tor-022-stable.wml ___________________________________________________________________ Added: svn:mime-type + text/vnd.wap.wml [View Less]

1 0

[tor/master] Add a bufferevent note to startup log
by nickm＠torproject.org 29 Aug '11

29 Aug '11

commit b51e21c5d0193d05a965b3b5f7e1435300d23333 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Aug 29 23:10:03 2011 +0200 Add a bufferevent note to startup log This should help us easily spot if a tor was built with --enable-bufferevent or not --- src/or/main.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 260de16..ad06fed 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2156,8 +… [View More]

1 0

r24977: {website} patches to download page to fix some display issues, layout (in website/trunk: css donate/en download/en js)
by Andrew Lewman 29 Aug '11

29 Aug '11

Author: phobos Date: 2011-08-29 18:50:48 +0000 (Mon, 29 Aug 2011) New Revision: 24977 Removed: website/trunk/download/en/head.wmi website/trunk/js/ppwidget.js Modified: website/trunk/css/layout-rtl.css website/trunk/css/layout.css website/trunk/donate/en/donate.wml website/trunk/donate/en/thankyou-head.wmi website/trunk/download/en/download.wml Log: patches to download page to fix some display issues, layout issues, and organization issues, from jeremy Modified: website/… [View More]trunk/css/layout-rtl.css =================================================================== --- website/trunk/css/layout-rtl.css 2011-08-29 02:37:19 UTC (rev 24976) +++ website/trunk/css/layout-rtl.css 2011-08-29 18:50:48 UTC (rev 24977) @@ -331,6 +331,11 @@ padding-right: 0px; } + .dbox.donate ul.amounts li { + margin-left: 0px; + margin-right: 15px; + } + #footer .about { padding-left: 30px; border-left: 1px solid #ddd; Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-08-29 02:37:19 UTC (rev 24976) +++ website/trunk/css/layout.css 2011-08-29 18:50:48 UTC (rev 24977) @@ -67,99 +67,94 @@ width: auto; } - #calltoaction { - height: 30px; - float: right; - margin-top: 10px; - margin-right: 5px; - text-align: center; - } +#calltoaction { + height: 30px; + float: right; + margin-top: 10px; + margin-right: 5px; + text-align: center; + } - #calltoaction ul { - padding: 0; - margin: 0px; - height: 30px; - list-style: none; - float: right; + #calltoaction ul { + padding: 0; + margin: 0px; + height: 30px; + list-style: none; + float: right; } - - #calltoaction ul li { - list-style: none; - display: inline; - float: none; - width: 100px; - margin-left: 0px; - } - - #calltoaction ul li a:link, - #calltoaction ul li a:visited { - background: url(../images/cta-buttons.jpg) top center no-repeat #885ca4; - padding: 8px 8px 0px; - color: #FFFFFF; - font-weight: bold; - text-decoration: none; - font-size: 1.067em; - line-height: 1.067em; - height: 22px; - width: 84px; - float: left; - text-shadow: 0px -1px 2px #111111, 0px 1px 2px #666666; - } - #calltoaction ul li:first-child a:link, - #calltoaction ul li:first-child a:visited { - background: url(../images/cta-buttons.jpg) top left no-repeat #885ca4; - -webkit-border-top-left-radius: 7px; - -webkit-border-bottom-left-radius: 7px; - -moz-border-radius-topleft: 7px; - -moz-border-radius-bottomleft: 7px; - border-top-left-radius: 7px; - border-bottom-left-radius: 7px; - padding-left: 7px; - width: 85px; - } + #calltoaction ul li { + list-style: none; + display: inline; + float: none; + width: 100px; + margin-left: 0px; + } + + #calltoaction ul li a:link, + #calltoaction ul li a:visited { + display: block; + background: url(../images/cta-buttons.jpg) top center no-repeat #885ca4; + padding: 4px 8px; + color: #FFFFFF; + font-weight: bold; + text-decoration: none; + font-size: 13px; + line-height: 22px; + height: 22px; + width: 84px; + float: left; + text-shadow: 1px 1px 0px #111111; + } - #calltoaction ul li:last-child a:link, - #calltoaction ul li:last-child a:visited { - background: url(../images/cta-buttons.jpg) top right no-repeat #885ca4; - -webkit-border-top-right-radius: 7px; - -webkit-border-bottom-right-radius: 7px; - -moz-border-radius-topright: 7px; - -moz-border-radius-bottomright: 7px; - border-top-right-radius: 7px; - border-bottom-right-radius: 7px; - padding-right: 9px; - width: 83px; - color: #FFFFFF; - } - - #calltoaction ul li:hover a { - background: url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800; - font-weight: bold; - text-shadow: 1px 1px 4px #111111; - } - - #calltoaction ul li:hover:first-child a { - background: url(../images/cta-buttons.jpg) bottom left no-repeat #ff9800; - -webkit-border-top-left-radius: 7px; - -webkit-border-bottom-left-radius: 7px; - -moz-border-radius-topleft: 7px; - -moz-border-radius-bottomleft: 7px; - border-top-left-radius: 7px; - border-bottom-left-radius: 7px; - } + #calltoaction ul li:hover a { + background: url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800; + font-weight: bold; + text-shadow: 1px 1px 0px #111111; + } + + #calltoaction ul li:first-child a:link, + #calltoaction ul li:first-child a:visited, + #calltoaction ul li:hover:first-child a { + -webkit-border-top-left-radius: 7px; + -webkit-border-bottom-left-radius: 7px; + -moz-border-radius-topleft: 7px; + -moz-border-radius-bottomleft: 7px; + border-top-left-radius: 7px; + border-bottom-left-radius: 7px; + } - #calltoaction ul li:hover:last-child a { - background: url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800; - -webkit-border-top-right-radius: 7px; - -webkit-border-bottom-right-radius: 7px; - -moz-border-radius-topright: 7px; - -moz-border-radius-bottomright: 7px; - border-top-right-radius: 7px; - border-bottom-right-radius: 7px; - } + #calltoaction ul li:first-child a:link, + #calltoaction ul li:first-child a:visited { + background: url(../images/cta-buttons.jpg) top left no-repeat #885ca4; + } + #calltoaction ul li:hover:first-child a { + background: url(../images/cta-buttons.jpg) bottom left no-repeat #ff9800; + } + #calltoaction ul li:last-child a:link, + #calltoaction ul li:last-child a:visited, + #calltoaction ul li:hover:last-child a { + -webkit-border-top-right-radius: 7px; + -webkit-border-bottom-right-radius: 7px; + -moz-border-radius-topright: 7px; + -moz-border-radius-bottomright: 7px; + border-top-right-radius: 7px; + border-bottom-right-radius: 7px; + } + + #calltoaction ul li:last-child a:link, + #calltoaction ul li:last-child a:visited { + background: url(../images/cta-buttons.jpg) top right no-repeat #885ca4; + color: #FFFFFF; + } + + #calltoaction ul li:hover:last-child a { + background: url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800; + } + + /* BANNER ------------*/ #banner { @@ -495,17 +490,18 @@ .smartphone24, .sourcecode24 { display: block; - line-height: 34px; + line-height: 32px; padding: 0px 0 0px 33px; } .accordionButton { - background: url("../images/table-head.jpg") repeat-x scroll left top #885CA4; + background: url("../images/table-title.jpg") repeat-x left bottom #885CA4; color: #FFFFFF; margin: 0; padding-left: 10px; font-size: 1.1em; font-weight: bold; + height: 32px; width: 700px; float: left; _float: none; /* Float works in all browsers but IE6 */ @@ -532,6 +528,10 @@ display: block; } +.accordionContent .fauxhead { + width: 710px; + } + .package { float: left; width: 668px; @@ -1025,7 +1025,7 @@ .dbox.donate ul.amounts li { display: inline-block; - margin-left: 20px; + margin-left: 15px; } .dbox.donate ul.amounts li label { Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-08-29 02:37:19 UTC (rev 24976) +++ website/trunk/donate/en/donate.wml 2011-08-29 18:50:48 UTC (rev 24977) @@ -29,7 +29,7 @@ </ul> <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations(a)torproject.org for more details.</p>  -<script type="text/javascript" src="$(DOCROOT)/jquery.min.js"></script> +<script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js"></script> <script type="text/javascript"> function displayVals() { var t3 = jQuery('#t3').val(); @@ -117,8 +117,8 @@ <input type="hidden" id="cmd" name="cmd" value="_donations"> <input type="hidden" name="business" value="donations(a)torproject.org"> <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou"> - <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"> + <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html"> + <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate/donate.html"> </div> </form> </div> @@ -142,10 +142,10 @@ <input type="hidden" name="isDonationWidget" value="1"> <input type="hidden" name="description" value="Supporting Online Anonymity & Privacy"> <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1"> - <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/donate/thankyou"> + <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/thankyou.html"> <input type="hidden" name="processImmediate" value="1"> <input type="hidden" name="cobrandingStyle" value="logo"> - <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate"> + <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate.html"> </div> </form> <small>Requires an Amazon Account</small> Modified: website/trunk/donate/en/thankyou-head.wmi =================================================================== --- website/trunk/donate/en/thankyou-head.wmi 2011-08-29 02:37:19 UTC (rev 24976) +++ website/trunk/donate/en/thankyou-head.wmi 2011-08-29 18:50:48 UTC (rev 24977) @@ -36,8 +36,8 @@ <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="$(DOCROOT)/jquery.min.js" charset="utf-8"></script> -<script type="text/javascript" src="$(DOCROOT)/jquery.infieldlabel.min.js" charset="utf-8"></script> +<script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js" charset="utf-8"></script> +<script type="text/javascript" src="$(DOCROOT)/js/jquery.infieldlabel.min.js" charset="utf-8"></script> <script type="text/javascript" charset="utf-8"> /* email placeholder function */ $(function(){ $("label").replaceWith('<label class="active" for="email">Enter your email address</label>'); $("label").inFieldLabels(); }); Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-08-29 02:37:19 UTC (rev 24976) +++ website/trunk/download/en/download.wml 2011-08-29 18:50:48 UTC (rev 24977) @@ -1,10 +1,10 @@ ## translation metadata # Revision: $Revision$ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" # -# +# # # @@ -313,6 +313,35 @@  <div id="sidecol-right">  + <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> <form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post"> <h2>Donate to Tor</h2> <p> @@ -340,8 +369,8 @@ <input type="hidden" id="cmd" name="cmd" value="_donations"> <input type="hidden" name="business" value="donations(a)torproject.org"> <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="<page donate/thankyou>"> - <input type="hidden" name="cancel_return" value="<page download/download>"> + <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html"> + <input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download.html"> </p> <h6 id="ppinfo" style="height:0px;"></h6> <p> Deleted: website/trunk/download/en/head.wmi =================================================================== --- website/trunk/download/en/head.wmi 2011-08-29 02:37:19 UTC (rev 24976) +++ website/trunk/download/en/head.wmi 2011-08-29 18:50:48 UTC (rev 24977) @@ -1,197 +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 Stoiman - 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" src="../js/ppwidget.js"> -#/* Script For Donation Widget */ - </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>."> Deleted: website/trunk/js/ppwidget.js =================================================================== (Binary files differ) [View Less]

1 0

[tor/master] Fix compilation on non-bufferevent systems after 3803 fix: oops.
by nickm＠torproject.org 29 Aug '11

29 Aug '11

commit cdbfc2a0c26fbe4cc3348babf3b92fb1ae931dec Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 29 13:41:59 2011 -0400 Fix compilation on non-bufferevent systems after 3803 fix: oops. --- src/or/connection.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 23546f0..7615952 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2223,6 +2223,7 @@ record_num_bytes_transferred_impl(… [View More]

1 0

[tor/master] Split out rephist parts of buckets_decrement
by nickm＠torproject.org 29 Aug '11

29 Aug '11

commit 0de8afd8f545b4104ffb05d307b019cdf5aa505a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 29 12:55:59 2011 -0400 Split out rephist parts of buckets_decrement For bufferevents, we had all of connection_buckets_decrement() stubbed out. But that's not actually right! The rephist_* parts were essential for, inter alia, recording our own bandwidth. This patch splits out the rephist parts of connection_buckets_decrement() into their own … [View More]function, and makes the bufferevent code call that new function. Fixes bug 3803, and probably 3824 and 3826 too. Bugfix on 0.2.3.1-alpha. --- changes/bug3803 | 4 +++ src/or/connection.c | 69 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 54 insertions(+), 19 deletions(-) diff --git a/changes/bug3803 b/changes/bug3803 new file mode 100644 index 0000000..2d50f0c --- /dev/null +++ b/changes/bug3803 @@ -0,0 +1,4 @@ + o Major bugfixes (bufferevents): + - Correctly record the bytes we've read and written when using + bufferevents, so that we can include them in our bandwidth history + and advertised bandwidth. Fixes bug 3803; bugfix on 0.2.3.1-alpha. diff --git a/src/or/connection.c b/src/or/connection.c index dc804dd..23546f0 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2193,24 +2193,11 @@ global_write_bucket_low(connection_t *conn, size_t attempt, int priority) return 0; } -#ifndef USE_BUFFEREVENTS -/** We just read <b>num_read</b> and wrote <b>num_written</b> bytes - * onto <b>conn</b>. Decrement buckets appropriately. */ +/** DOCDOC */ static void -connection_buckets_decrement(connection_t *conn, time_t now, - size_t num_read, size_t num_written) +record_num_bytes_transferred_impl(connection_t *conn, + time_t now, size_t num_read, size_t num_written) { - if (num_written >= INT_MAX || num_read >= INT_MAX) { - log_err(LD_BUG, "Value out of range. num_read=%lu, num_written=%lu, " - "connection type=%s, state=%s", - (unsigned long)num_read, (unsigned long)num_written, - conn_type_to_string(conn->type), - conn_state_to_string(conn->type, conn->state)); - if (num_written >= INT_MAX) num_written = 1; - if (num_read >= INT_MAX) num_read = 1; - tor_fragile_assert(); - } - /* Count bytes of answering direct and tunneled directory requests */ if (conn->type == CONN_TYPE_DIR && conn->purpose == DIR_PURPOSE_SERVER) { if (num_read > 0) @@ -2234,6 +2221,50 @@ connection_buckets_decrement(connection_t *conn, time_t now, } if (conn->type == CONN_TYPE_EXIT) rep_hist_note_exit_bytes(conn->port, num_written, num_read); +} + +/** DOCDOC */ +static void +record_num_bytes_transferred(connection_t *conn, + time_t now, size_t num_read, size_t num_written) +{ + /* XXX023 check if this is necessary */ + if (num_written >= INT_MAX || num_read >= INT_MAX) { + log_err(LD_BUG, "Value out of range. num_read=%lu, num_written=%lu, " + "connection type=%s, state=%s", + (unsigned long)num_read, (unsigned long)num_written, + conn_type_to_string(conn->type), + conn_state_to_string(conn->type, conn->state)); + if (num_written >= INT_MAX) num_written = 1; + if (num_read >= INT_MAX) num_read = 1; + tor_fragile_assert(); + } + + record_num_bytes_transferred_impl(conn,now,num_read,num_written); +} + +#ifndef USE_BUFFEREVENTS +/** We just read <b>num_read</b> and wrote <b>num_written</b> bytes + * onto <b>conn</b>. Decrement buckets appropriately. */ +static void +connection_buckets_decrement(connection_t *conn, time_t now, + size_t num_read, size_t num_written) +{ + if (num_written >= INT_MAX || num_read >= INT_MAX) { + log_err(LD_BUG, "Value out of range. num_read=%lu, num_written=%lu, " + "connection type=%s, state=%s", + (unsigned long)num_read, (unsigned long)num_written, + conn_type_to_string(conn->type), + conn_state_to_string(conn->type, conn->state)); + if (num_written >= INT_MAX) num_written = 1; + if (num_read >= INT_MAX) num_read = 1; + tor_fragile_assert(); + } + + record_num_bytes_transferred_(conn, now, num_read, num_written); + + if (!connection_is_rate_limited(conn)) + return; /* local IPs are free */ if (connection_counts_as_relayed_traffic(conn, now)) { global_relayed_read_bucket -= (int)num_read; @@ -2443,7 +2474,6 @@ connection_bucket_should_increase(int bucket, or_connection_t *conn) return 1; } #else - static void connection_buckets_decrement(connection_t *conn, time_t now, size_t num_read, size_t num_written) @@ -2454,6 +2484,7 @@ connection_buckets_decrement(connection_t *conn, time_t now, (void) num_written; /* Libevent does this for us. */ } + void connection_bucket_refill(int seconds_elapsed, time_t now) { @@ -2826,7 +2857,7 @@ evbuffer_inbuf_callback(struct evbuffer *buf, if (info->n_added) { time_t now = approx_time(); conn->timestamp_lastread = now; - connection_buckets_decrement(conn, now, info->n_added, 0); + record_num_bytes_transferred(conn, now, info->n_added, 0); connection_consider_empty_read_buckets(conn); if (conn->type == CONN_TYPE_AP) { edge_connection_t *edge_conn = TO_EDGE_CONN(conn); @@ -2847,7 +2878,7 @@ evbuffer_outbuf_callback(struct evbuffer *buf, if (info->n_deleted) { time_t now = approx_time(); conn->timestamp_lastwritten = now; - connection_buckets_decrement(conn, now, 0, info->n_deleted); + record_num_bytes_transferred(conn, now, 0, info->n_deleted); connection_consider_empty_write_buckets(conn); if (conn->type == CONN_TYPE_AP) { edge_connection_t *edge_conn = TO_EDGE_CONN(conn); [View Less]

1 0

[torouter/master] add interfaces and module overrides
by ioerror＠torproject.org 29 Aug '11

29 Aug '11

commit d450147910a05d72b304cdfe2d449a65e7db41a3 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Mon Aug 29 18:16:46 2011 +0200 add interfaces and module overrides --- freedom-maker/mk_dreamplug_rootfs | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/freedom-maker/mk_dreamplug_rootfs b/freedom-maker/mk_dreamplug_rootfs index a70f032..5f11bc9 100755 --- a/freedom-maker/mk_dreamplug_rootfs +++ b/freedom-maker/mk_dreamplug_rootfs @@ -115,6 +115,12 @@ … [View More]

1 0

[torouter/master] print info before takeover
by ioerror＠torproject.org 29 Aug '11

29 Aug '11

commit 582053df481e11b7f1648a9983a71ed147f75cf9 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Mon Aug 29 17:22:14 2011 +0200 print info before takeover --- packages/torouter_easy_setup.sh | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/packages/torouter_easy_setup.sh b/packages/torouter_easy_setup.sh index f5bf6c5..d9a85ea 100755 --- a/packages/torouter_easy_setup.sh +++ b/packages/torouter_easy_setup.sh @@ -33,5 +33,28 @@ … [View More]

1 0

r24976: {website} new download page layout from jeremy from ticket 3590. (in website/trunk: . css download/en images js)
by Andrew Lewman 29 Aug '11

29 Aug '11

Author: phobos Date: 2011-08-29 02:37:19 +0000 (Mon, 29 Aug 2011) New Revision: 24976 Added: website/trunk/download/en/head.wmi website/trunk/download/en/lang.wmi website/trunk/images/button-downloadpage.png website/trunk/images/icon-linux24.png website/trunk/images/icon-mac24.png website/trunk/images/icon-smartphone24.png website/trunk/images/icon-sourcecode24.png website/trunk/images/icon-windows24.png website/trunk/js/ website/trunk/js/dlpage01.js website/… [View More]

1 0

r24975: {} make the farsi translations include sidenav, header, footer, (in website/trunk/include: . fa)
by Andrew Lewman 29 Aug '11

29 Aug '11

Author: phobos Date: 2011-08-29 02:12:07 +0000 (Mon, 29 Aug 2011) New Revision: 24975 Added: website/trunk/include/fa/ website/trunk/include/fa/foot.wmi website/trunk/include/fa/head.wmi website/trunk/include/fa/info.wmi website/trunk/include/fa/navigation.wmi website/trunk/include/fa/side.wmi Log: make the farsi translations include sidenav, header, footer, navigation so they can use the right to left css and even look correct. Added: website/trunk/include/fa/foot.wmi =====… [View More]============================================================== --- website/trunk/include/fa/foot.wmi (rev 0) +++ website/trunk/include/fa/foot.wmi 2011-08-29 02:12:07 UTC (rev 24975) @@ -0,0 +1,131 @@ +#!/usr/bin/env wml +#use "functions.wmi" + + <div id="footer"> + <div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor"></div> + <div class="about"> + <p>"Tor" and the "Onion Logo" are registered trademarks of + <a href="<page docs/trademark-faq>">The Tor Project, Inc.</a> + Content on this site is licensed under a <a + href="http://creativecommons.org/licenses/by/3.0/us/">Creative + Commons Attribution 3.0 United States License</a>, unless + otherwise noted.</p> + + </div> +  +  + <div class="col first"> + <h4>About Tor</h4> + <ul> + <li><a href="<page about/overview>">What Tor Does</a></li> + <li><a href="<page about/torusers>">Users of Tor</a></li> + <li><a href="<page about/corepeople>">Core Tor People</a></li> + <li><a href="<page about/sponsors>">Sponsors</a></li> + <li><a href="<page about/contact>">Contact Us</a></li> + </ul> + </div> +  + <div class="col"> + <h4>Get Involved</h4> + <ul> + <li><a href="<page donate/donate>">Donate</a></li> + <li><a href="<page docs/documentation>#MailingLists">Mailing List</a></li> + <li><a href="<page getinvolved/mirrors>">Mirrors</a></li> + <li><a href="<page docs/hidden-services>">Hidden Services</a></li> + <li><a href="<page getinvolved/translation>">Translations</a></li> +# <li><a href="<page getinvolved/open-positions>">Careers</a></li> + </ul> + </div> +  + <div class="col"> + <h4>Documentation</h4> + <ul> + <li><a href="<page docs/tor-manual>">Manuals</a></li> + <li><a href="<page docs/documentation>">Installation Guides</a></li> + <li><a href="<wiki>">Tor Wiki</a></li> + <li><a href="<page docs/faq>">General Tor FAQ</a></li> + </ul> + </div> +  + +  + <div class="col wider"> + <h4>Languages</h4> + <: if (has_translations()) { :> + <p> + This page is also available in the following languages: + <: print list_translations() :>.<br /> + How to set <a href="http://www.debian.org/intro/cn#howtoset">the default document language</a>. + </p> + <: }; :> + </div> + +# LANGUAGE SWITCH CGI +# <div class="col wider"> +# <h4>Languages</h4> +# # this is a cgi trampoline to bounce us to the right page +# # alternately, if the client supports javascript we can redirect that way +# # noscript does not block onclick but clients may have disabled javascript completely +# # +# # for this to work we need to know the relative path from the document root +# # to the current directory that wml is in. +# <form action="$(DOCROOT)/cgi-bin/languageswitch.cgi"> +# <select name="Language" id="lang"> +# <:{ +# #import "perl-globals.wmi"; +# use Cwd; +# use Cwd 'abs_path'; +# use File::Spec; +# my $urlbase = File::Spec->abs2rel(getcwd(),abs_path("$(DOCROOT)")); +# my $LANGUAGES; +# my $page = $WML_SRC_FILENAME; +# opendir(DIR, getcwd()) or die $!; +# # take a look and see what language support we have +# while (my $file = readdir(DIR)) { +# if (-d $file) { +# if (-e "$file/$page") { +# my $url = $urlbase.'/'.$WML_SRC_BASENAME.'.html.'.$file; +# my $url2js = $WML_SRC_BASENAME.'.html.'.$file; +# print '<option value="'.$url.'" onclick="window.location=\''.$url2js.'\'">'.$LANGUAGES{$file}.'</option>'."\n" unless not defined $LANGUAGES{$file}; +# } +# } +# } +# closedir(DIR); +# }:> +# </select> +# <input class="go" type="submit" name="submit" value="Go"> +# </form> +# <p>Questions on this? Visit <a href="http://www.debian.org/intro/cn#howtoset">how to set the default document language</a>.</p> +# </div> +# + </div> +  + + </div> +  +</body> +</html> Added: website/trunk/include/fa/head.wmi =================================================================== --- website/trunk/include/fa/head.wmi (rev 0) +++ website/trunk/include/fa/head.wmi 2011-08-29 02:12:07 UTC (rev 24975) @@ -0,0 +1,145 @@ +#! /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"> +</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 %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>."> Added: website/trunk/include/fa/info.wmi =================================================================== --- website/trunk/include/fa/info.wmi (rev 0) +++ website/trunk/include/fa/info.wmi 2011-08-29 02:12:07 UTC (rev 24975) @@ -0,0 +1,10 @@ +#!/usr/bin/env wml +<div class="img-shadow"> + <div class="infoblock"> + <h2 class="bulb">Tor Tip</h2> + <p>Tor is written for and supported by people like you. <a href="<page +donate/donate>">Donate today</a>!</p> + </div> +  +</div> + Added: website/trunk/include/fa/navigation.wmi =================================================================== --- website/trunk/include/fa/navigation.wmi (rev 0) +++ website/trunk/include/fa/navigation.wmi 2011-08-29 02:12:07 UTC (rev 24975) @@ -0,0 +1,24 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 22069 $ +# Translation-Priority: 1-high + +<: + # path link text + my @navigation = ( + 'index' , 'Home', + 'about/overview' , 'About Tor', + 'docs/documentation' , 'Documentation', + 'projects/projects' , 'Projects', + 'press/press' , 'Press', + '<blog>' , 'Blog', + 'http://printfection.com/torprojectstore' , 'Store', + ); + my @calltoaction = ( + 'download/download' , 'Download', + 'getinvolved/volunteer' , 'Volunteer', + 'donate/donate' , 'Donate', + ); + +:> Added: website/trunk/include/fa/side.wmi =================================================================== --- website/trunk/include/fa/side.wmi (rev 0) +++ website/trunk/include/fa/side.wmi 2011-08-29 02:12:07 UTC (rev 24975) @@ -0,0 +1,91 @@ +#! /usr/bin/wml +<: use strict; :> +<: use warnings; :> +#use "perl-globals.wmi" +#use "links.wmi" +#use "versions.wmi" +#use "sidenav.wmi" +<div class="img-shadow"> + <div id="sidenav"> + <: + # recursively search menu structure to see if it contains a given page + sub containsSub($$); + sub containsSub($$) { + my ($elements, $page) = @_; + for my $ele (@{$elements}) { + if (containsSub($ele->{'subelements'},$page)){ + return 1; + } elsif ($page eq $ele->{'url'}) { + return 1; + } + + } + return 0; + } + + # generate navigation menu + sub printNavMenu($$$); + sub printNavMenu($$$) { + my ($navmenu, $page, $lang) = @_; + print '<ul>'."\n"; + for my $navmenu (@{$navmenu}) { + # this menu entry is the current (active) page + if ($navmenu->{'url'} eq $page) { + + # the current page has nested menu elements + if ($navmenu->{'subelements'}) { # menu has dropdown + printf '<li class="dropdown active"><a class="active" href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + + print '<li>'."\n"; + printNavMenu($navmenu->{'subelements'},$page,$lang); + print '</li>'."\n"; + + # the current (active) page does not have sub elements + } else { + printf '<li class="active"><a class="active" href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + } + + # a subelement of this menu item is the current (active) page + } elsif (containsSub($navmenu->{'subelements'}, $page)) { + printf '<li class="dropdown"><a class="active" href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + + print '<li>'."\n"; #encapsulate subelements + # recurse to generate the expanded menu + printNavMenu($navmenu->{'subelements'},$page,$lang); + print '</li>'."\n"; #encapsulate subelements + + # the menu entry is not active and does not enclose the active page + } else { + + # if there are subelements, set collapsed style + if ($navmenu->{'subelements'}) { + printf '<li class="dropdown"><a href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + # regular menu entry + } else { + printf '<li><a href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + } + } + } + print '</ul>'."\n"; + } + + my $lang = "$(LANG)"; + + use Cwd; + use Cwd 'abs_path'; + use File::Spec; + + # get document path from site root + my $path = File::Spec->abs2rel(getcwd(),abs_path("$(DOCROOT)")); + my $page = $WML_SRC_BASENAME; + printNavMenu($sidenav, $path.'/'.$page, $lang); + :> + </div> +  +</div> + [View Less]

1 0

[tor/master] add another heuristic for making release notes
by arma＠torproject.org 29 Aug '11

29 Aug '11

commit 38881173188209db0bb9dd40bacc48aa1883f5e4 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Aug 28 21:43:19 2011 -0400 add another heuristic for making release notes --- doc/HACKING | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index 9747f22..b0689d8 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -426,10 +426,10 @@ interesting and understandable. first entry or two and the last entry most interesting:… [View More]

1 0