- tor-commits - lists.torproject.org

r25015: {} add a diginotar directory for ioerror (projects/misc)
by Sebastian Hahn 04 Sep '11

04 Sep '11

Author: sebastian Date: 2011-09-04 17:08:44 +0000 (Sun, 04 Sep 2011) New Revision: 25015 Added: projects/misc/diginotar/ Log: add a diginotar directory for ioerror

1 0

r25014: {website} download, js, and css patches from jeremy. (in website/trunk: css download/en js)
by Andrew Lewman 04 Sep '11

04 Sep '11

Author: phobos Date: 2011-09-04 14:04:31 +0000 (Sun, 04 Sep 2011) New Revision: 25014 Modified: website/trunk/css/layout-rtl.css website/trunk/css/layout.css website/trunk/download/en/download.wml website/trunk/js/dlpage01.js website/trunk/js/jquery.accordion.min.js Log: download, js, and css patches from jeremy. Modified: website/trunk/css/layout-rtl.css =================================================================== --- website/trunk/css/layout-rtl.css 2011-09-04 13:57:09 UTC (rev 25013) +++ website/trunk/css/layout-rtl.css 2011-09-04 14:04:31 UTC (rev 25014) @@ -231,10 +231,26 @@ } .accordionButton { - padding-left: 0; - padding-right: 10px; + padding-left: 0px; + padding-right: 30px; } +.on:before { + left: 0px; + right: 10px; + } + +.off:before { + left: 0px; + right: 14px; + border-left: none; + border-right: 7px solid #FFFFFF; + } + +.accordionContent .fauxhead { + width: 707px; + } + .package p { padding-left: 0px; padding-right: 10px; Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-09-04 13:57:09 UTC (rev 25013) +++ website/trunk/css/layout.css 2011-09-04 14:04:31 UTC (rev 25014) @@ -498,11 +498,9 @@ 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 */ border: 1px solid #FFFFFF; @@ -514,13 +512,42 @@ -moz-border-radius-topright: 7px; border-top-left-radius: 7px; border-top-right-radius: 7px; + position: relative; + padding-left: 30px; + width: 680px; } .accordionButton:hover { text-shadow: 1px 1px 0px rgba(17, 17, 17, 1); } -.accordionContent { +.on:before, +.off:before { + position: absolute; + content: ''; + height: 0px; + width: 0px; + font-size:0px; + line-height:0px; + } + +.on:before { + top: 14px; + left: 10px; + border-left:7px solid transparent; + border-right:7px solid transparent; + border-top:7px solid #FFFFFF; + } + +.off:before { + top: 9px; + left: 14px; + border-bottom:7px solid transparent; /* left arrow slant */ + border-top:7px solid transparent; /* right arrow slant */ + border-left:7px solid #FFFFFF; /* bottom, add background color here */ + } + + .accordionContent { width: 708px; float: left; _float: none; /* Float works in all browsers but IE6 */ Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-09-04 13:57:09 UTC (rev 25013) +++ website/trunk/download/en/download.wml 2011-09-04 14:04:31 UTC (rev 25014) @@ -22,7 +22,7 @@    - <div id="windows" style="border-top: 0px;" class="accordionButton"> + <div id="windows" style="border-top: 0px;" class="accordionButton on"> <span class="windows24">Microsoft Windows</span> </div> <div class="accordionContent"> @@ -114,7 +114,7 @@ </div>   - <div id="apple" class="accordionButton"> + <div id="apple" class="accordionButton on"> <span class="mac24">Apple OS X</span></div> <div class="accordionContent"> <div class="fauxhead"></div> @@ -163,7 +163,7 @@ </div>   - <div id="linux" class="accordionButton"> + <div id="linux" class="accordionButton on"> <span class="linux24">Linux, BSD, & Unix</span></div> <div class="accordionContent"> <div class="fauxhead"></div> @@ -196,7 +196,7 @@ </div>   - <div id="smartphone" class="accordionButton"> + <div id="smartphone" class="accordionButton on"> <span class="smartphone24">Tor for Smartphones</span></div> <div class="accordionContent"> <div class="fauxhead"></div> @@ -230,7 +230,7 @@ </div>   - <div class="accordionButton"> + <div class="accordionButton on"> <span class="sourcecode24">Source Code</span></div> <div class="accordionContent"> <div class="fauxhead"></div> Modified: website/trunk/js/dlpage01.js =================================================================== (Binary files differ) Modified: website/trunk/js/jquery.accordion.min.js =================================================================== (Binary files differ)

1 0

r25013: {website} link the overview page again. (website/trunk/download/en)
by Andrew Lewman 04 Sep '11

04 Sep '11

Author: phobos Date: 2011-09-04 13:57:09 +0000 (Sun, 04 Sep 2011) New Revision: 25013 Modified: website/trunk/download/en/download-easy.wml Log: link the overview page again. Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2011-09-04 13:42:33 UTC (rev 25012) +++ website/trunk/download/en/download-easy.wml 2011-09-04 13:57:09 UTC (rev 25013) @@ -146,13 +146,11 @@ mailing list</a>. You can also <a href="http://rss.gmane.org/gmane.network.onion-routing.announce">watch the list's RSS feed</a>.</p> - +<p>Interested in <a href="<page about/overview>">learning more about Tor in general</a>?</p> </td> </tr> </tbody> </table> - </div>  <div id="sidecol-right">

1 0

r25012: {website} make download-easy the default. (website/trunk/include)
by Andrew Lewman 04 Sep '11

04 Sep '11

Author: phobos Date: 2011-09-04 13:42:33 +0000 (Sun, 04 Sep 2011) New Revision: 25012 Modified: website/trunk/include/navigation.wmi Log: make download-easy the default. Modified: website/trunk/include/navigation.wmi =================================================================== --- website/trunk/include/navigation.wmi 2011-09-04 13:41:39 UTC (rev 25011) +++ website/trunk/include/navigation.wmi 2011-09-04 13:42:33 UTC (rev 25012) @@ -16,7 +16,7 @@ 'http://printfection.com/torprojectstore' , 'Store', ); my @calltoaction = ( - 'download/download' , 'Download', + 'download/download-easy' , 'Download', 'getinvolved/volunteer' , 'Volunteer', 'donate/donate' , 'Donate', );

1 0

r25011: {website} make download-easy the default. (in website/trunk: . en)
by Andrew Lewman 04 Sep '11

04 Sep '11

Author: phobos Date: 2011-09-04 13:41:39 +0000 (Sun, 04 Sep 2011) New Revision: 25011 Modified: website/trunk/.htaccess website/trunk/en/index.wml website/trunk/en/navigation.wmi Log: make download-easy the default. Modified: website/trunk/.htaccess =================================================================== --- website/trunk/.htaccess 2011-09-04 12:05:03 UTC (rev 25010) +++ website/trunk/.htaccess 2011-09-04 13:41:39 UTC (rev 25011) @@ -41,5 +41,5 @@ # Download websites RewriteRule ^download/$ /download/download [R=301,L] RewriteRule ^download.html(.*) /download/download.html$1 [R=301,L] -RewriteRule ^easy-download(.*) /download/download$1 [R=301,L] +RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L] Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2011-09-04 12:05:03 UTC (rev 25010) +++ website/trunk/en/index.wml 2011-09-04 13:41:39 UTC (rev 25011) @@ -17,7 +17,7 @@ <p class="desc">Protect your privacy. Defend yourself against network surveillance and traffic analysis.</p> <div id="download"> - <a href="<page download/download>"> + <a href="<page download/download-easy>"> <span class="download-tor">Download Tor</span></a> </div> </div> Modified: website/trunk/en/navigation.wmi =================================================================== --- website/trunk/en/navigation.wmi 2011-09-04 12:05:03 UTC (rev 25010) +++ website/trunk/en/navigation.wmi 2011-09-04 13:41:39 UTC (rev 25011) @@ -16,7 +16,7 @@ 'http://printfection.com/torprojectstore' , 'Store', ); my @calltoaction = ( - 'download/download' , 'Download', + 'download/download-easy' , 'Download', 'getinvolved/volunteer' , 'Volunteer', 'donate/donate' , 'Donate', );

1 0

[gettor/master] Add a hack so we are still able to answer to users requesting
by kaner＠torproject.org 04 Sep '11

04 Sep '11

commit 64bb565ad1a7785fdd4a65f92ba26f73425c4e63 Author: Christian Fromme <kaner(a)strace.org> Date: Sun Sep 4 14:40:17 2011 +0200 Add a hack so we are still able to answer to users requesting "tor-browser-bundle" --- lib/gettor/requests.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/lib/gettor/requests.py b/lib/gettor/requests.py index 2ee275e..1a9cdac 100644 --- a/lib/gettor/requests.py +++ b/lib/gettor/requests.py @@ -96,6 +96,10 @@ class requestMail: def matchPackage(self, line): """Look up which package the user is requesting. """ + # XXX HACK ALERT: This makes it possible for users to still request + # the windows bundle by its old name + packages_hacked = self.config.PACKAGES + packages_hacked['tor-browser-bundle'] = () for p in self.config.PACKAGES.keys(): matchme = ".*" + p + ".*" match = re.match(matchme, line, re.DOTALL)

1 0

r25010: {website} Updated the package names for en, fr, pl (in website/trunk/projects: en fr pl)
by Christian Fromme 04 Sep '11

04 Sep '11

Author: kaner Date: 2011-09-04 12:05:03 +0000 (Sun, 04 Sep 2011) New Revision: 25010 Modified: website/trunk/projects/en/gettor.wml website/trunk/projects/fr/gettor.wml website/trunk/projects/pl/gettor.wml Log: Updated the package names for en, fr, pl Modified: website/trunk/projects/en/gettor.wml =================================================================== --- website/trunk/projects/en/gettor.wml 2011-09-04 11:35:15 UTC (rev 25009) +++ website/trunk/projects/en/gettor.wml 2011-09-04 12:05:03 UTC (rev 25010) @@ -42,12 +42,12 @@ I am sorry, but your request was not understood. Please select one of the following package names: - panther-bundle - source-bundle - windows-bundle - tiger-bundle - tor-browser-bundle - tor-im-browser-bundle + windows + macos-i386 + macos-ppc + linux-i386 + linux-x86_64 + source Please send me another email. It only needs a single package name anywhere in the body of your email. Modified: website/trunk/projects/fr/gettor.wml =================================================================== --- website/trunk/projects/fr/gettor.wml 2011-09-04 11:35:15 UTC (rev 25009) +++ website/trunk/projects/fr/gettor.wml 2011-09-04 12:05:03 UTC (rev 25010) @@ -48,12 +48,12 @@ I am sorry, but your request was not understood. Please select one of the following package names: - panther-bundle - source-bundle - windows-bundle - tiger-bundle - tor-browser-bundle - tor-im-browser-bundle + windows + macos-i386 + macos-ppc + linux-i386 + linux-x86_64 + source Please send me another email. It only needs a single package name anywhere in the body of your email. </pre> Modified: website/trunk/projects/pl/gettor.wml =================================================================== --- website/trunk/projects/pl/gettor.wml 2011-09-04 11:35:15 UTC (rev 25009) +++ website/trunk/projects/pl/gettor.wml 2011-09-04 12:05:03 UTC (rev 25010) @@ -48,12 +48,12 @@ I am sorry, but your request was not understood. Please select one of the following package names: - panther-bundle - source-bundle - windows-bundle - tiger-bundle - tor-browser-bundle - tor-im-browser-bundle + windows + macos-i386 + macos-ppc + linux-i386 + linux-x86_64 + source Please send me another email. It only needs a single package name anywhere in the body of your email.

1 0

r25009: {website} updated de/navigation.wmi from sacro (website/trunk/include/de)
by Runa Sandvik 04 Sep '11

04 Sep '11

Author: runa Date: 2011-09-04 11:35:15 +0000 (Sun, 04 Sep 2011) New Revision: 25009 Modified: website/trunk/include/de/navigation.wmi Log: updated de/navigation.wmi from sacro Modified: website/trunk/include/de/navigation.wmi =================================================================== --- website/trunk/include/de/navigation.wmi 2011-09-03 22:35:29 UTC (rev 25008) +++ website/trunk/include/de/navigation.wmi 2011-09-04 11:35:15 UTC (rev 25009) @@ -1,4 +1,4 @@ -#!/usr/bin/wml +#!/usr/bin/wml ## translation metadata # Revision: $Revision$ @@ -18,7 +18,7 @@ my @calltoaction = ( 'download/download' , 'Download', 'donate/donate' , 'Spenden', - 'getinvolved/volunteer' , 'Engagiere Dich', + 'getinvolved/volunteer' , 'Engagement', ); :>

1 0

[gettor/master] Add a note about the large size of the macosx-i386 browser bundle.
by kaner＠torproject.org 04 Sep '11

04 Sep '11

commit 707dc6db95b53486c4082f0605f7ab222d291de8 Author: Christian Fromme <kaner(a)strace.org> Date: Sun Sep 4 11:20:45 2011 +0200 Add a note about the large size of the macosx-i386 browser bundle. --- lib/gettor/responses.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/gettor/responses.py b/lib/gettor/responses.py index d293b23..d8bcae3 100644 --- a/lib/gettor/responses.py +++ b/lib/gettor/responses.py @@ -27,7 +27,8 @@ def getPackageHelpText(t): return t.gettext(i18n.GETTOR_TEXT[6]) + "\n\n" \ + t.gettext(i18n.GETTOR_TEXT[46]) + "\n\n" \ + t.gettext(i18n.GETTOR_TEXT[47]) + "\n\n" \ - + t.gettext(i18n.GETTOR_TEXT[48]) + "\n\n" \ + + t.gettext(i18n.GETTOR_TEXT[48]) + "\n" \ + + t.gettext(i18n.GETTOR_TEXT[51]) + "\n\n" \ + t.gettext(i18n.GETTOR_TEXT[49]) + "\n\n" \ + t.gettext(i18n.GETTOR_TEXT[50]) + "\n" \ + t.gettext(i18n.GETTOR_TEXT[51]) + "\n\n" \

1 0

[torbel/master] Allow users to enter a port
by sebastian＠torproject.org 04 Sep '11

04 Sep '11

commit b16ed8464acb8eb0463cde10c00066fc9e5ec322 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Sep 4 10:05:14 2011 +0200 Allow users to enter a port --- bulklist.fcgi | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bulklist.fcgi b/bulklist.fcgi index 1e28f01..ccd96b4 100755 --- a/bulklist.fcgi +++ b/bulklist.fcgi @@ -44,14 +44,13 @@ def app(environ, start_response): q = parse_qs(environ['QUERY_STRING']) - ip = escape(q.get('ip', [''])[0]) + orig_ip = escape(q.get('ip', [''])[0]) port = escape(q.get('port', [''])[0]) - if ip != "": - try: - ip = query.ip_from_string(ip) - except socket.error: - ip = 0 + try: + ip = query.ip_from_string(orig_ip) + except socket.error: + ip = 0 if ip != 0: try: @@ -71,7 +70,7 @@ def app(environ, start_response): for i in exits: yield '%s\n' % IPAddress(i) else: - start_response('200 OK', [('Content-Type', 'text/plain')]) + start_response('200 OK', [('Content-Type', 'text/html')]) yield '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" ' yield '"http://www.w3.org/TR/REC-html40/loose.dtd">\n' yield '<html>\n' @@ -102,6 +101,8 @@ def app(environ, start_response): yield 'Please enter an IP address:<br>\n' yield '<form action="/cgi-bin/TorBulkExitList.py" name="ip">\n' yield '<input type="text" name="ip"><br>\n' + yield 'and optionally a Port:<br>\n' + yield '<input type="text" name="port"><br>\n' yield '<input type="submit" value="Submit">' yield '</form>'

1 0