From 1d03562504884073002907ddf8d981f9bae7610f Mon Sep 17 00:00:00 2001 From: traumschule Date: Wed, 24 Oct 2018 16:17:58 +0200 Subject: [PATCH] merge download pages (#14686) - update .htaccess - warnings.wmi: recommend to use Pluggable Transports (#25098) - add slackbuilds (fixes #26307) - link to Tor Browser Hacking Guide (#24255) - link to OnionBrowser with warning (fixes #26133) - tor: add oldstable, testing and beta (#17805, #26298) - update links to download page (#27131) - replace javascript with css accordion (#27540) - css: move OS box up, clean indention --- .htaccess | 5 +- css/layout.css | 305 ++++-- css/layout.min.css | 101 +- docs/en/debian.wml | 4 +- docs/en/faq.wml | 4 +- docs/en/pluggable-transports.wml | 2 +- download/en/download-easy.wml | 361 ------- download/en/download-unix.wml | 183 ---- download/en/download.wml | 1579 +++++++++++++++++++++++++----- en/index.wml | 2 +- en/navigation.wmi | 30 +- include/links.wmi | 3 +- include/navigation.wmi | 6 +- include/versions.wmi | 12 + include/warning.wmi | 132 +++ js/dlpage01.js | 57 +- projects/en/torbrowser.wml | 890 +---------------- 17 files changed, 1684 insertions(+), 1992 deletions(-) delete mode 100644 download/en/download-easy.wml delete mode 100644 download/en/download-unix.wml mode change 100644 => 120000 en/navigation.wmi create mode 100644 include/warning.wmi diff --git a/.htaccess b/.htaccess index c1f0557c..bf46b49a 100644 --- a/.htaccess +++ b/.htaccess @@ -61,7 +61,10 @@ RewriteRule ^contact(.*) /about/contact$1 [R=301,L] # Download websites RewriteRule ^download/$ /download/download [R=301,L] RewriteRule ^download.html(.*) /download/download.html$1 [R=301,L] -RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L] +RewriteRule ^easy-download(.*) /download/download$1 [R=301,L] +RewriteRule ^download-easy(.*) /download/download$1 [R=301,L] +RewriteRule ^download-unix(.*) /download/download$1 [R=301,L] +RewriteRule ^tor(.*) /download/download [R=301,L] # Relays RewriteRule ^relays(.*) /getinvolved/relays [R=301,L] diff --git a/css/layout.css b/css/layout.css index 55ae4eae..9539939a 100644 --- a/css/layout.css +++ b/css/layout.css @@ -9,6 +9,7 @@ body { #wrap { width: 960px; + max-width: 100%; margin: 0 auto; } @@ -224,6 +225,7 @@ body { #content { width: 960px; + max-width: 100%; } #content img { max-width: 710px; } @@ -239,8 +241,10 @@ body { #maincol { float: right; width: 710px; + max-width: 75%; margin-bottom: 20px; } + .tb#maincol { max-width: 100%; } #dow-don-left, #maincol-left { @@ -281,7 +285,7 @@ body { float: right; width: 230px; margin-left: 20px; - padding-top: 100px; + -padding-top: 100px; } #torusers { margin: 0 0 27px; } @@ -478,7 +482,7 @@ table tr img { width: auto; } -/* DL PAGE ------------*/ +/* DOWNLOAD ------------*/ .windows24 { /* Open Icon Library - Webpage Icons Package @@ -556,73 +560,15 @@ table tr img { width: 680px; } - .accordionButton:hover { - background: url("../images/table-title-hover.jpg") repeat-x left bottom #885CA4; - text-shadow: 1px 1px 0px rgba(17, 17, 17, 1); - } - -.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 */ - background: #FFFFFF; - display: block; - } - -.accordionContent .fauxhead { - width: 710px; - } - -.package { - float: left; - height: 280px; - margin: 0px; - padding: 25px 20px 20px 20px; - border-top: 1px solid #888888; - } - - .package h2 { - margin-bottom: 3px; - } - - .package p { - margin-top: 16px; - padding-left: 10px; - } +.accordionButton:hover { + background: url("../images/table-title-hover.jpg") repeat-x left bottom #885CA4; + text-shadow: 1px 1px 0px rgba(17, 17, 17, 1); +} .downloads { - display: block; - float: left; - width: 238px; padding: 0 16px 0 0; text-align: center; - } +} .lang { float: right; @@ -640,7 +586,7 @@ table tr img { -moz-border-radius-bottomright: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; - } +} .button { text-align: center; @@ -654,29 +600,22 @@ table tr img { -webkit-border-radius: 7px; -moz-border-radius: 7px; border-radius: 7px; - } +} .button .strong { display: block; padding: 10px 0 0 57px; - } +} .button .normal { padding: 5px 0 0 57px; display: block; - } +} .sig { display: block; margin: 3px 0px 20px 0px; - } - -/* DOWNLOAD-EASY ---*/ - -.easy { - width: 712px; - margin-bottom: 10px; - padding-bottom: 8px; + margin-bottom: 5px } #download-donate { @@ -690,31 +629,41 @@ table tr img { background-size: 100% 100%; } -.easy .package h2, -.easy .package em { +.package { + display: block; + float: left; + width: 250px; + margin: 0px; + padding: 20px 20px 20px 20px; +} + +.package h2, +.package em { display: block; width: 100%; text-align: left; - } +} -.easy .package h2 { +.package h2 { padding-top: 10px; padding-bottom: 5px; - } + margin-bottom: 3px; +} -.easy .package em { - font-size: 1.2em; +.package em { + font-size: 1.0em; padding-top: 8px; padding-bottom: 4px; - } +} -.easy .package p { +.package p { padding-left: 0px; font-size: 15px; text-align: justify; - } + margin-top: 16px; +} -.easy .package p.alt-dl { +.package p.alt-dl { text-align: left; text-indent: 0px; padding-left: 0px; @@ -728,20 +677,6 @@ table tr img { font-size: 15px; } -.all-dl a{ - text-decoration: none; - font-weight: bold; -} - -.all-dl a:hover{ - text-decoration: underline; -} - -.easy .package { - float: none; - padding: 0 8px 0 12px ; - } - .open { display: block; } @@ -812,14 +747,14 @@ table tr img { margin-bottom: 0px; } -.warning { +.note { float: left; _float: none; /* Float works in all browsers but IE6 */ padding: 25px 25px; margin-top: 4px; } - .warning p { + .note p { padding-left: 10px; } @@ -1493,3 +1428,165 @@ p.blogDate { mark { background: cyan; } + +/* +** accordion +** +** hides content and shows it on click on a label +** source: https://tympanus.net/codrops/2012/02/21/accordion-with-css3/ +** used for docs/en/verifying-signatures.wml +*/ +.accordion { + margin: 10px auto 30px auto; +} +.accordion pre { + padding: 15px; + line-height: 150%; +} +.accordion .hint { + color: grey; + font-size: 90%; +} +.accordion input { + display: none; +} +.accordion label:hover, +.accordion input:checked + label, +.accordion input:checked + label:hover{ + text-shadow: 0px 1px 1px rgba(255,255,255, 0.6); +} +.accordion label{ + padding: 5px 0px; + position: relative; + z-index: 19; + display: block; + cursor: pointer; + text-shadow: 1px 1px 1px rgba(255,255,255,0.8); + background: linear-gradient(top, #ffffff 1%,#bda5cc 100%); +} +.accordion label a { + color: #66a516; +} +.accordion div.nav { + right: 50px; +} +.accordion .nav { + float: right; + max-width: 400px; + text-decoration: none; +} +.accordion .nav ul { + list-style: none; + text-align: right; +} +.accordion .nav hint { + font-size: -50%; +} +.accordion article { + height: 0px; + overflow: hidden; + position: relative; + z-index: 10; + transition: + height 0.3s ease-in-out, + box-shadow 0.6s linear; +} +.accordion .ac-box input:active ~ label p a, +.accordion .ac-box input:checked ~ label p a { + font-weight: bold; + color: red; + text-decoration: underline; +} +.accordion div:hover ~ article, +.accordion div:active ~ article, +.accordion input:checked ~ article { + height: 100%; + transition: + height 0.5s ease-in-out, + box-shadow 0.1s linear; +} +.accordion input:active ~ article.ac-box +.accordion input:checked ~ article.ac-box { + -background: grey; + border: solid 1px #66a516; + padding: 15px; + margin-bottom: 30px; +} +.accordion article h4 { + margin: 15px; +} +.accordion article.ac-box label, +.accordion article.ac-box label h4 { + display: inline; +} + +/* Accordion for download page */ +.dlcontent { + margin: 25px; + font-family: sans-serif; +} +.dlcontent h1 { + padding: 25px; + text-align: center; + margin: 10px 50px; +} + +.dlcontent section > p { + margin-left: 50px; +} + +.tor-source, +.dlcontent .nav { + float: left; +} +.dlcontent .nav ul { + list-style: none; + margin: 0px; +} +.dlcontent .nav li { + display: block; + margin: 0px; + padding: 0px; + font-size: 1em; + font-weight: bold; + height: 33px; + border-top-left-radius: 7px; + border-top-right-radius: 7px; + width: 250px; + background: url("../images/table-title.jpg") repeat-x left bottom #885ca4; +} +.dlcontent .nav li a { + color: #fff; +} + +.accordion.download label { + margin-left: 25px; + padding-left: 30px; +} + +.accordion.download input:checked ~ article { + padding:20px; + border: solid 1px #66a516; +} +.dltor, +section#torbrowser .os, +section#torbrowser .lang { + clear: both; +} + +table#packages th { + padding: 10px; +} + +.tblang th { + text-align: center; + font-weight: bold; +} +.accordion.download article h2 { + font-family: sans-serif; + font-size: 2em; + text-align: center; + margin: 25px; +} + +/* END ACCORDION */ diff --git a/css/layout.min.css b/css/layout.min.css index f45df9d1..52d122db 100644 --- a/css/layout.min.css +++ b/css/layout.min.css @@ -1,100 +1 @@ -@charset "UTF-8";body{background:#fff}#wrap{width:960px;margin:0 auto}.left{float:left}.right{float:right}.twenty{width:20%}.thirty{width:30%}.forty{width:40%}.fifty{width:50%}.sixty{width:60%}.hundred{width:100%}.nopad{padding:0}.toppad{padding-top:10px}.toptwenty{margin-top:20px}.topforty{margin-top:40px}.hidden{display:none}#header{width:960px;height:97px;margin-bottom:23px;position:relative}h1#logo{margin:0;float:left}h1#logo a,h1#logo a:visited{background:url(../images/tor-logo.png) left top no-repeat;background-size:150px 97px;text-indent:-9999px;overflow:hidden;width:150px;height:97px;display:block}#nav{position:absolute;top:30px;left:115px;float:right}#nav ul{height:50px;float:right;margin-bottom:0}#nav ul li{float:left;display:inline;width:auto}#calltoaction{height:30px;float:right;margin-top:100px;margin-right:5px;text-align:center}#calltoaction ul{padding:0;margin:0;height:30px;list-style:none;float:right}#calltoaction ul li{list-style:none;display:inline;float:none;width:100px;margin-left:0}#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:#fff;font-weight:bold;text-decoration:none;font-size:13px;line-height:22px;height:22px;width:84px;float:left;text-shadow:1px 1px 0 #111}#calltoaction ul li:hover a{background:url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800;font-weight:bold;text-shadow:1px 1px 0 #111}#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: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:#fff}#calltoaction ul li:hover:last-child a{background:url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800}#banner{background:url(../images/bg-banner.jpg) left top no-repeat;height:200px;width:600px;padding:23px 15px;margin-bottom:15px}#download a:link,#download a:visited{margin:-17px 0 0;background:url(../images/button-download.png) left top no-repeat;width:257px;height:79px;float:left;padding:35px 0 0 80px;text-decoration:none}#download a .download-tor{background:url(../images/button-download-arrow.png) right center no-repeat;font-family:"Arial Narrow",Arial,sans-serif;color:#fff;font-size:2.167em;letter-spacing:1px;padding-right:25px}#download a .version{color:#bda5cc;font-size:1.167em;line-height:1.167em}#download a .info{color:#bda5cc;font-size:.833em;line-height:.833em}#download a:hover{background-position:0 -114px}#download a:hover .version,#download a:hover .info{color:#f1c6a1}#banner ul{background:#387520 url(../images/banner-gradient.jpg) left top repeat-x;border:1px solid #366b32;width:180px;float:right;margin:0 15px 0 0;padding:10px 10px 10px 30px}#banner ul li{list-style:url(../images/white-bullet.png) outside;padding:5px 0}#content{width:960px}#content img{max-width:710px}#breadcrumbs{padding:0 0 10px 5px}#home #maincol{float:left;width:620px;margin-right:20px}#maincol{float:right;width:710px;margin-bottom:20px}#dow-don-left,#maincol-left{float:left;width:710px;margin-bottom:20px}#maincol .topforty .icon img{border:0}.subcol{width:280px;float:left;margin:0 0 25px}#content .first{margin-right:20px}#home #sidecol{float:right;width:300px}#sidecol{float:left;width:230px;margin-right:20px}#dow-don-right,#sidecol-right{float:right;width:230px;margin-left:20px;padding-top:100px}#torusers{margin:0 0 27px}.user{margin:0 0 12px;height:auto}.user img,.project-icon{border:1px solid #cac8a7;float:left;margin:3px 10px 0 0}.user p{margin:0}.img-shadow{float:left;background:url(../images/shadowAlpha.png) no-repeat bottom right !important;background:url(../images/shadow.gif) no-repeat bottom right;margin:10px 0 10px 10px !important;margin:10px 0 10px 5px}.img-shadow .infoblock,.img-shadow .important-infoblock,.img-shadow .custom-infoblock,.img-shadow #sidenav,.img-shadow .sidenav-sub{display:block;position:relative;margin:-6px 6px 6px -6px;background-color:#fff;border:1px solid #ddd}.img-shadow .important-infoblock{background-color:#f7f8f0;border:1px solid #eeefe8}.img-shadow .infoblock,.img-shadow .important-infoblock{padding:15px;width:188px}.img-shadow .custom-infoblock{padding:15px;height:120px;width:426px}.img-shadow .infoblock p,.img-shadow .important-infoblock p,.img-shadow .custom-infoblock p{margin:0}.img-shadow #sidenav,.img-shadow .sidenav-sub{padding:10px 0 0;width:218px}#sidenav ul li,.sidenav-sub ul li{border-bottom:1px solid #ddd}#sidenav ul li.dropdown a:link,#sidenav ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left center no-repeat}#sidenav ul li.dropdown a.active{background:url(../images/sidenav-arrow-active.gif) left center no-repeat}.sidenav-sub ul li.dropdown a:link,.sidenav-sub ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left top no-repeat;margin-top:12px}#sidenav ul li a:link,#sidenav ul li a:visited{display:block;height:auto;padding:8px 15px 8px 26px}#sidenav ul li ul li a:link,#sidenav ul li ul li a:visited{padding-left:37px}.sidenav-sub ul li a:link,.sidenav-sub ul li a:visited{display:block;padding:0 15px 10px 26px;line-height:16px}#sidenav ul li.active{background:url(../images/sidenav-active.png) left center no-repeat;width:230px;border:0}#sidenav ul li ul li ul li a:link,#sidenav ul li ul li ul li a:visited{padding-left:48px}#press tr:nth-child(even){background-color:#e5e5e5}table{width:100%}td{padding:12px}table td img,table tr img{border:0;float:left;margin-right:10px}.icon{float:left;width:auto;margin-right:15px;padding:10px 0;border:0}.calendar{background:url(../images/icon-calendar.jpg) left top no-repeat;float:left;margin-right:10px;width:45px;height:54px;text-align:center;padding:4px 0}.fauxhead{background:url(../images/table-arrow.jpg) right top no-repeat;width:100%;height:11px}#home-our-projects td{height:92px;width:296px;padding:6px}#ecosystem_presentation{height:30px;padding-top:10px;padding-left:60px;vertical-align:middle;background:url("../images/video.png") no-repeat scroll left center transparent;font-size:1.7em;font-weight:bold}#ecosystem_presentation a{text-decoration:none}.project{float:left;padding:6px;border:1px solid #cac8a7;height:76px;width:284px;-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px}.project img{border:0;margin-right:6px}.beige{background:#f5f5df}.gray{background:#e0e0e0}.meta{float:right;width:auto}.windows24{background:url("../images/icon-windows24.png") no-repeat scroll left center transparent}.mac24{background:url("../images/icon-mac24.png") no-repeat scroll left center transparent}.linux24{background:url("../images/icon-linux24.png") no-repeat scroll left center transparent}.android24{background:url("../images/icon-android24.png") no-repeat scroll left center transparent;background-size:24px}.smartphone24{background:url("../images/icon-smartphone24.png") no-repeat scroll left center transparent}.sourcecode24{background:url("../images/icon-sourcecode24.png") no-repeat scroll left center transparent}.windows24,.mac24,.linux24,.android24,.smartphone24,.sourcecode24{display:block;line-height:32px;padding:0 0 0 33px}.accordionButton{background:url("../images/table-title.jpg") repeat-x left bottom #885ca4;color:#fff;margin:0;font-size:1.1em;font-weight:bold;height:32px;float:left;_float:none;border:1px solid #fff;border-bottom:0;cursor:pointer;-webkit-border-top-left-radius:7px;-webkit-border-top-right-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-topright:7px;border-top-left-radius:7px;border-top-right-radius:7px;position:relative;padding-left:30px;width:680px}.accordionButton:hover{background:url("../images/table-title-hover.jpg") repeat-x left bottom #885ca4;text-shadow:1px 1px 0 rgba(17,17,17,1)}.on:before,.off:before{position:absolute;content:'';height:0;width:0;font-size:0;line-height:0}.on:before{top:14px;left:10px;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #fff}.off:before{top:9px;left:14px;border-bottom:7px solid transparent;border-top:7px solid transparent;border-left:7px solid #fff}.accordionContent{width:708px;float:left;_float:none;background:#fff;display:block}.accordionContent .fauxhead{width:710px}.package{float:left;height:280px;margin:0;padding:25px 20px 20px 20px;border-top:1px solid #888}.package h2{margin-bottom:3px}.package p{margin-top:16px;padding-left:10px}.downloads{display:block;float:left;width:238px;padding:0 16px 0 0;text-align:center}.lang{float:right;display:none;width:80px;height:20px;margin:0 7px 0 0;padding:0 0 0 3px;background-color:#fefff7;border:2px solid #cccfb8;border-top:0;-webkit-border-bottom-left-radius:5px;-webkit-border-bottom-right-radius:5px;-moz-border-radius-bottomleft:5px;-moz-border-radius-bottomright:5px;border-bottom-left-radius:5px;border-bottom-right-radius:5px}.button{text-align:center;display:block;width:234px;height:69px;text-decoration:none;background:url(../images/button-downloadpage.png) bottom left no-repeat;margin:0 auto 8px auto;text-shadow:1px 1px 0 rgba(17,17,17,1);-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.button .strong{display:block;padding:10px 0 0 57px}.button .normal{padding:5px 0 0 57px;display:block}.sig{display:block;margin:3px 0 20px 0}.easy{width:712px;margin-bottom:10px;padding-bottom:8px}#download-donate{background-attachment:scroll;background-clip:border-box;background-color:transparent;background-image:url(../images/headerbg.jpg);background-origin:padding-box;background-position:0 0;background-repeat:no-repeat;background-size:100% 100%}.easy .package h2,.easy .package em{display:block;width:100%;text-align:left}.easy .package h2{padding-top:10px;padding-bottom:5px}.easy .package em{font-size:1.2em;padding-top:8px;padding-bottom:4px}.easy .package p{padding-left:0;font-size:15px;text-align:justify}.easy .package p.alt-dl{text-align:left;text-indent:0;padding-left:0;margin-top:32px}.all-dl{display:block;text-align:left;width:100%;font-size:15px}.all-dl a{text-decoration:none;font-weight:bold}.all-dl a:hover{text-decoration:underline}.easy .package{float:none;padding:0 8px 0 12px}.open{display:block}.lang-alt{line-height:15px;font-size:10px;float:right;margin-right:10px}.expander{text-align:right;float:right;padding:10px 20px 0 0;font-size:15px;display:none}.title{background:url(../images/table-title-arrow.jpg) right top no-repeat;padding:10px 25px 0 10px;height:33px;float:left}.title a:link,.title a:visited{background:url(../images/table-title.jpg) left top no-repeat;height:33px;display:block}.paypal{float:left;width:auto;min-height:159px;max-width:365px}.paypal span{padding-right:20px}.warning-top{width:618px;padding:10px 10px 10px 60px;margin:0 10px 0 10px;display:block;background:url("../images/warning.png") no-repeat scroll 2px 23px #fffeb6;border:1px solid #a6a427;border-bottom:0;-webkit-border-top-left-radius:5px;-webkit-border-top-right-radius:5px;-moz-border-radius-topleft:5px;-moz-border-radius-topright:5px;border-top-left-radius:5px;border-top-right-radius:5px}.warning-top h2{padding-right:15px;padding-left:0;margin-bottom:5px}.warning-top p{padding-left:10px;margin-bottom:0}.warning{float:left;_float:none;padding:25px 25px;margin-top:4px}.warning p{padding-left:10px}.focus{background:#f4f2c7;border:1px solid #ebd4a9;padding:10px 15px}.focus .icon{float:left;width:auto;margin-right:10px}.featured-project{width:313px}input,select{margin:0 3px 10px 0}input.textfield{padding:0 10px;vertical-align:top}.donate-btn{background:left top no-repeat;height:26px;width:92px;text-indent:-9999px;overflow:hidden;border:0;vertical-align:top;margin-top:5px}.donate-btn:hover{background-position:0 -26px;cursor:pointer}.signup{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;height:31px;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em}.signup:hover{background:#6ab334}select#lang{float:left;width:160px;margin-right:3px}.go{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em;height:18px}.go:hover{background:#6ab334}#footer{width:1024px;height:200px;border-top:1px solid #ddd;padding:20px 0;margin:20px 0 0}.onion{float:left;width:88px;padding-right:20px;height:100%}#footer .about{width:180px;padding-right:30px;border-right:1px solid #ddd;float:left}#footer .newsletter{padding:0 0 15px 30px;width:auto;margin-left:308px}#footer input.textfield{width:220px;height:26px}#footer input{margin:0}#footer .col{float:left;width:100px;margin-left:20px}#footer .first{margin-left:30px}#footer .wider{width:201px}small{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:italic}.hlist{text-align:center;display:block;width:100%;padding:0;list-style:none;margin:0 0 18px 0}.hlist li{display:inline-block;border-right:1px solid #444;margin-left:-4px}.hlist li.last{border-right:0 solid #444}.hlist a{display:block;top:0;right:0;bottom:0;left:0;text-decoration:none;font-weight:bold;padding:0 8px}.dbox{float:none;text-align:center;color:#222;border:0;padding:1.4em .7em;width:163px;margin:0 0 0 10px}.dbox p{display:block;padding:0;margin:0}.dbox h2{padding:13px 0 15px 0;position:relative;color:black;font-family:Helvetica,Arial,sans-serif;font-size:18px;font-weight:normal;height:35px;margin-bottom:-20px;margin-left:-6px;z-index:-10}.dbox input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:68px;width:186px;margin-top:0;display:block;background-color:transparent;color:transparent;margin:10px auto 10px auto;padding:0}.dbox span{float:left;padding-right:0}.dbox div label{padding:0 10px 0 0}.dbox h6#ppinfo{width:100%;text-align:center;margin:-15px auto 0 auto}.dbox small,.dbox.donate #ppinfo{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:normal}.dbox.dl{float:none;width:177px;margin:0 5px 20px 5px}.dbox.dl input.amount{width:87px}.dbox.donate{float:none;padding:30px 30px;width:626px;min-height:0;max-width:none;text-align:left}.dbox.donate input,.dbox.donate select{padding-bottom:0;margin-bottom:0}.dbox.donate .drow{margin:0 0 0 20px}.dbox.donate .drow div{padding:0;width:auto;display:block}.dbox.donate h3{padding-left:0;color:#23300e;margin:0 0 10px 0}.dbox.donate h4{padding-left:20px}.dbox.donate p{padding:5px 20px 15px 40px}.dbox.donate span{float:left;padding-right:0}.dbox.donate div label{padding:0 10px 0 0}.dbox.donate .type{padding-left:20px}.dbox.donate select#t3{width:auto;margin-bottom:0}.dbox.donate ul.amounts{width:auto}.dbox.donate ul.amounts li{display:inline-block}.dbox.donate ul.amounts li label{padding:0 0 0 5px}.dbox.donate input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:26px;width:115px;margin-top:-3px;display:inline-block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall{position:relative;display:inline-block;width:170px;height:140px;text-align:center;margin:0 10px;vertical-align:top}.dbox.dsmall input.donate-btn{background:url() left top no-repeat transparent;width:auto;height:auto;margin-top:0;display:block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall div label{padding:0}.dbox.dsmall small{display:block;position:absolute;width:172px;float:none;bottom:20px;margin:0 auto}.givv p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}dwolla p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}div.blogRow,div.blogFirstRow{height:40px;padding:3px 10px;margin:0}div.blogLastRow{height:20px;text-align:center}div.blogFirstRow{height:22px;background:url(../images/table-head.jpg) left top repeat-x #885ca4}.blogRow:hover{background:#f6ffd5}div.blogRow1,div.blogRow3{background:#eee8f1}.blogFeed a{text-decoration:none}.blogFeed p{margin:0;font-size:12px}p.blogTitle{font-weight:bold;text-decoration:underline}p.blogAuthor{color:#000;text-align:right;margin-top:-20px}p.blogAuthor em{color:#4e6a20;text-align:right;margin-top:-20px}p.blogDate{color:#000}.blogFeed h2{font-size:1.467em;margin:0;line-height:23px;color:#f6f6ed}#projectpage td{width:50%}.projectbox{width:710px;position:relative;margin-bottom:80px}.projectbox .name{font-size:1.5em;font-weight:bold}.projectbox a img{float:none;position:absolute;top:0;left:0}.projectbox .projectdesc{margin-left:100px}.clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden}.clearfix{display:inline-block}/*\*/* html .clearfix{height:1%}.clearfix{display:block}/**/.joblink{display:block;font-size:128%;font-weight:bold;padding:10px 5px;text-align:right}.joblink a{text-decoration:none}.dropbtn{background-color:white;padding:16px 0 0 0;font-size:100%;border:0;cursor:pointer}.dropdown{position:relative;display:inline-block;padding:0;margin-top:-16px;top:0}.dropdown-content{display:none;position:absolute;background-color:#f9f9f9;box-shadow:0 8px 16px 0 rgba(0,0,0,0.2);z-index:1;margin:48px 0 0 0}.dropdown-content a{color:black;padding-top:12px 16px;text-decoration:none;display:block}.dropdown:hover .dropdown-content{display:block}@font-face{font-family:Source Sans Pro;src:url('fonts/SourceSansPro/SourceSansPro-Regular.ttf')}@font-face{font-family:Source Sans Pro Light;src:url('fonts/SourceSansPro/SourceSansPro-Light.ttf')}@font-face{font-family:Source Sans Pro Bold;src:url('fonts/SourceSansPro/SourceSansPro-Bold.ttf')}@font-face{font-family:Source Serif Pro;src:url('fonts/SourceSerifPro/SourceSerifPro-Regular.ttf')}@font-face{font-family:Source Code Pro;src:url('fonts/SourceCodePro/SourceCodePro-Regular.ttf')} - -.eoy-background { - background-color: #F8F9FA; - width: 100%; - height: 300px; - margin-bottom: 35px; -} - -.eoy-wrap { - width: 960px; - margin: auto; - padding-top: 20px; -} - -.eoy-artwork { - width: 40%; - background: url(../images/artwork@2x.png) left bottom no-repeat; - background-size: contain; - float: left; - height: 280px; -} - -.eoy-message { - width: 55%; - float: right; - padding-left: 35px; -} - -.advance-universal-hu { - color: #420C5D; - font-family: Source Sans Pro; - font-size: 24px; - font-weight: 600; - line-height: 29px; - text-align: left; -} - -.tor-strength-in-num { - color: #55246D; - font-family: Source Sans Pro; - font-size: 12px; - font-weight: 600; - line-height: 14px; - text-align: left; -} - -.give-today-and-mozi { - color: #420C5D; - font-family: Source Sans Pro; - font-size: 13px; - font-weight: 400; - line-height: 16px; - text-align: left; -} - -.tor-strength-in-num > p { - text-transform: uppercase; -} - -.keep-tor-strong-giv { - color: #420C5D; - font-family: Source Sans Pro; - font-size: 24px; - font-weight: 600; - line-height: 29px; - text-align: left; -} - -.keep-tor-strong-giv > span { - font-size: 60%; -} - -.eoy-btn-container{ - padding-top: 5%; - padding-bottom: 5%; -} - -.eoy-btn { - background-color: #420C5D; - border-radius: 3px; - width: 120px; - height: 35px; - padding: 10px; - padding-left: 20px; - padding-right: 20px; -} - -.count-me-in { - color: #FFFFFF !important; - font-family: Source Sans Pro; - font-size: 14px; - font-weight: 600; - line-height: 17px; - text-align: center; -} - -mark { - background: cyan; -} +@charset "UTF-8";body{background:#fff}#wrap{width:960px;max-width:100%;margin:0 auto}.left{float:left}.right{float:right}.twenty{width:20%}.thirty{width:30%}.forty{width:40%}.fifty{width:50%}.sixty{width:60%}.hundred{width:100%}.nopad{padding:0}.toppad{padding-top:10px}.toptwenty{margin-top:20px}.topforty{margin-top:40px}.hidden{display:none}#header{width:960px;height:97px;margin-bottom:23px;position:relative}h1#logo{margin:0;float:left}h1#logo a,h1#logo a:visited{background:url(../images/tor-logo.png) left top no-repeat;background-size:150px 97px;text-indent:-9999px;overflow:hidden;width:150px;height:97px;display:block}#nav{position:absolute;top:30px;left:115px;float:right}#nav ul{height:50px;float:right;margin-bottom:0}#nav ul li{float:left;display:inline;width:auto}#calltoaction{height:30px;float:right;margin-top:100px;margin-right:5px;text-align:center}#calltoaction ul{padding:0;margin:0;height:30px;list-style:none;float:right}#calltoaction ul li{list-style:none;display:inline;float:none;width:100px;margin-left:0}#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:#fff;font-weight:bold;text-decoration:none;font-size:13px;line-height:22px;height:22px;width:84px;float:left;text-shadow:1px 1px 0 #111}#calltoaction ul li:hover a{background:url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800;font-weight:bold;text-shadow:1px 1px 0 #111}#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: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:#fff}#calltoaction ul li:hover:last-child a{background:url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800}#banner{background:url(../images/bg-banner.jpg) left top no-repeat;height:200px;width:600px;padding:23px 15px;margin-bottom:15px}#download a:link,#download a:visited{margin:-17px 0 0;background:url(../images/button-download.png) left top no-repeat;width:257px;height:79px;float:left;padding:35px 0 0 80px;text-decoration:none}#download a .download-tor{background:url(../images/button-download-arrow.png) right center no-repeat;font-family:"Arial Narrow",Arial,sans-serif;color:#fff;font-size:2.167em;letter-spacing:1px;padding-right:25px}#download a .version{color:#bda5cc;font-size:1.167em;line-height:1.167em}#download a .info{color:#bda5cc;font-size:.833em;line-height:.833em}#download a:hover{background-position:0 -114px}#download a:hover .version,#download a:hover .info{color:#f1c6a1}#banner ul{background:#387520 url(../images/banner-gradient.jpg) left top repeat-x;border:1px solid #366b32;width:180px;float:right;margin:0 15px 0 0;padding:10px 10px 10px 30px}#banner ul li{list-style:url(../images/white-bullet.png) outside;padding:5px 0}#content{width:960px;max-width:100%}#content img{max-width:710px}#breadcrumbs{padding:0 0 10px 5px}#home #maincol{float:left;width:620px;margin-right:20px}#maincol{float:right;width:710px;max-width:75%;margin-bottom:20px}.tb#maincol{max-width:100%}#dow-don-left,#maincol-left{float:left;width:710px;margin-bottom:20px}#maincol .topforty .icon img{border:0}.subcol{width:280px;float:left;margin:0 0 25px}#content .first{margin-right:20px}#home #sidecol{float:right;width:300px}#sidecol{float:left;width:230px;margin-right:20px}#dow-don-right,#sidecol-right{float:right;width:230px;margin-left:20px;-padding-top:100px}#torusers{margin:0 0 27px}.user{margin:0 0 12px;height:auto}.user img,.project-icon{border:1px solid #cac8a7;float:left;margin:3px 10px 0 0}.user p{margin:0}.img-shadow{float:left;background:url(../images/shadowAlpha.png) no-repeat bottom right !important;background:url(../images/shadow.gif) no-repeat bottom right;margin:10px 0 10px 10px !important;margin:10px 0 10px 5px}.img-shadow .infoblock,.img-shadow .important-infoblock,.img-shadow .custom-infoblock,.img-shadow #sidenav,.img-shadow .sidenav-sub{display:block;position:relative;margin:-6px 6px 6px -6px;background-color:#fff;border:1px solid #ddd}.img-shadow .important-infoblock{background-color:#f7f8f0;border:1px solid #eeefe8}.img-shadow .infoblock,.img-shadow .important-infoblock{padding:15px;width:188px}.img-shadow .custom-infoblock{padding:15px;height:120px;width:426px}.img-shadow .infoblock p,.img-shadow .important-infoblock p,.img-shadow .custom-infoblock p{margin:0}.img-shadow #sidenav,.img-shadow .sidenav-sub{padding:10px 0 0;width:218px}#sidenav ul li,.sidenav-sub ul li{border-bottom:1px solid #ddd}#sidenav ul li.dropdown a:link,#sidenav ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left center no-repeat}#sidenav ul li.dropdown a.active{background:url(../images/sidenav-arrow-active.gif) left center no-repeat}.sidenav-sub ul li.dropdown a:link,.sidenav-sub ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left top no-repeat;margin-top:12px}#sidenav ul li a:link,#sidenav ul li a:visited{display:block;height:auto;padding:8px 15px 8px 26px}#sidenav ul li ul li a:link,#sidenav ul li ul li a:visited{padding-left:37px}.sidenav-sub ul li a:link,.sidenav-sub ul li a:visited{display:block;padding:0 15px 10px 26px;line-height:16px}#sidenav ul li.active{background:url(../images/sidenav-active.png) left center no-repeat;width:230px;border:0}#sidenav ul li ul li ul li a:link,#sidenav ul li ul li ul li a:visited{padding-left:48px}#press tr:nth-child(even){background-color:#e5e5e5}table{width:100%}td{padding:12px}table td img,table tr img{border:0;float:left;margin-right:10px}.icon{float:left;width:auto;margin-right:15px;padding:10px 0;border:0}.calendar{background:url(../images/icon-calendar.jpg) left top no-repeat;float:left;margin-right:10px;width:45px;height:54px;text-align:center;padding:4px 0}.fauxhead{background:url(../images/table-arrow.jpg) right top no-repeat;width:100%;height:11px}#home-our-projects td{height:92px;width:296px;padding:6px}#ecosystem_presentation{height:30px;padding-top:10px;padding-left:60px;vertical-align:middle;background:url("../images/video.png") no-repeat scroll left center transparent;font-size:1.7em;font-weight:bold}#ecosystem_presentation a{text-decoration:none}.project{float:left;padding:6px;border:1px solid #cac8a7;height:76px;width:284px;-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px}.project img{border:0;margin-right:6px}.beige{background:#f5f5df}.gray{background:#e0e0e0}.meta{float:right;width:auto}.windows24{background:url("../images/icon-windows24.png") no-repeat scroll left center transparent}.mac24{background:url("../images/icon-mac24.png") no-repeat scroll left center transparent}.linux24{background:url("../images/icon-linux24.png") no-repeat scroll left center transparent}.android24{background:url("../images/icon-android24.png") no-repeat scroll left center transparent;background-size:24px}.smartphone24{background:url("../images/icon-smartphone24.png") no-repeat scroll left center transparent}.sourcecode24{background:url("../images/icon-sourcecode24.png") no-repeat scroll left center transparent}.windows24,.mac24,.linux24,.android24,.smartphone24,.sourcecode24{display:block;line-height:32px;padding:0 0 0 33px}.accordionButton{background:url("../images/table-title.jpg") repeat-x left bottom #885ca4;color:#fff;margin:0;font-size:1.1em;font-weight:bold;height:32px;float:left;_float:none;border:1px solid #fff;border-bottom:0;cursor:pointer;-webkit-border-top-left-radius:7px;-webkit-border-top-right-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-topright:7px;border-top-left-radius:7px;border-top-right-radius:7px;position:relative;padding-left:30px;width:680px}.accordionButton:hover{background:url("../images/table-title-hover.jpg") repeat-x left bottom #885ca4;text-shadow:1px 1px 0 rgba(17,17,17,1)}.downloads{padding:0 16px 0 0;text-align:center}.lang{float:right;display:none;width:80px;height:20px;margin:0 7px 0 0;padding:0 0 0 3px;background-color:#fefff7;border:2px solid #cccfb8;border-top:0;-webkit-border-bottom-left-radius:5px;-webkit-border-bottom-right-radius:5px;-moz-border-radius-bottomleft:5px;-moz-border-radius-bottomright:5px;border-bottom-left-radius:5px;border-bottom-right-radius:5px}.button{text-align:center;display:block;width:234px;height:69px;text-decoration:none;background:url(../images/button-downloadpage.png) bottom left no-repeat;margin:0 auto 8px auto;text-shadow:1px 1px 0 rgba(17,17,17,1);-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.button .strong{display:block;padding:10px 0 0 57px}.button .normal{padding:5px 0 0 57px;display:block}.sig{display:block;margin:3px 0 20px 0;margin-bottom:5px}#download-donate{background-attachment:scroll;background-clip:border-box;background-color:transparent;background-image:url(../images/headerbg.jpg);background-origin:padding-box;background-position:0 0;background-repeat:no-repeat;background-size:100% 100%}.package{display:block;float:left;width:250px;margin:0;padding:20px 20px 20px 20px}.package h2,.package em{display:block;width:100%;text-align:left}.package h2{padding-top:10px;padding-bottom:5px;margin-bottom:3px}.package em{font-size:1.0;padding-top:8px;padding-bottom:4px}.package p{padding-left:0;font-size:15px;text-align:justify;margin-top:16px}.package p.alt-dl{text-align:left;text-indent:0;padding-left:0;margin-top:32px}.all-dl{display:block;text-align:left;width:100%;font-size:15px}.open{display:block}.lang-alt{line-height:15px;font-size:10px;float:right;margin-right:10px}.expander{text-align:right;float:right;padding:10px 20px 0 0;font-size:15px;display:none}.title{background:url(../images/table-title-arrow.jpg) right top no-repeat;padding:10px 25px 0 10px;height:33px;float:left}.title a:link,.title a:visited{background:url(../images/table-title.jpg) left top no-repeat;height:33px;display:block}.paypal{float:left;width:auto;min-height:159px;max-width:365px}.paypal span{padding-right:20px}.warning-top{width:618px;padding:10px 10px 10px 60px;margin:0 10px 0 10px;display:block;background:url("../images/warning.png") no-repeat scroll 2px 23px #fffeb6;border:1px solid #a6a427;border-bottom:0;-webkit-border-top-left-radius:5px;-webkit-border-top-right-radius:5px;-moz-border-radius-topleft:5px;-moz-border-radius-topright:5px;border-top-left-radius:5px;border-top-right-radius:5px}.warning-top h2{padding-right:15px;padding-left:0;margin-bottom:5px}.warning-top p{padding-left:10px;margin-bottom:0}.note{float:left;_float:none;padding:25px 25px;margin-top:4px}.note p{padding-left:10px}.focus{background:#f4f2c7;border:1px solid #ebd4a9;padding:10px 15px}.focus .icon{float:left;width:auto;margin-right:10px}.featured-project{width:313px}input,select{margin:0 3px 10px 0}input.textfield{padding:0 10px;vertical-align:top}.donate-btn{background:left top no-repeat;height:26px;width:92px;text-indent:-9999px;overflow:hidden;border:0;vertical-align:top;margin-top:5px}.donate-btn:hover{background-position:0 -26px;cursor:pointer}.signup{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;height:31px;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em}.signup:hover{background:#6ab334}select#lang{float:left;width:160px;margin-right:3px}.go{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em;height:18px}.go:hover{background:#6ab334}#footer{width:1024px;height:200px;border-top:1px solid #ddd;padding:20px 0;margin:20px 0 0}.onion{float:left;width:88px;padding-right:20px;height:100%}#footer .about{width:180px;padding-right:30px;border-right:1px solid #ddd;float:left}#footer .newsletter{padding:0 0 15px 30px;width:auto;margin-left:308px}#footer input.textfield{width:220px;height:26px}#footer input{margin:0}#footer .col{float:left;width:100px;margin-left:20px}#footer .first{margin-left:30px}#footer .wider{width:201px}small{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:italic}.hlist{text-align:center;display:block;width:100%;padding:0;list-style:none;margin:0 0 18px 0}.hlist li{display:inline-block;border-right:1px solid #444;margin-left:-4px}.hlist li.last{border-right:0 solid #444}.hlist a{display:block;top:0;right:0;bottom:0;left:0;text-decoration:none;font-weight:bold;padding:0 8px}.dbox{float:none;text-align:center;color:#222;border:0;padding:1.4em .7em;width:163px;margin:0 0 0 10px}.dbox p{display:block;padding:0;margin:0}.dbox h2{padding:13px 0 15px 0;position:relative;color:black;font-family:Helvetica,Arial,sans-serif;font-size:18px;font-weight:normal;height:35px;margin-bottom:-20px;margin-left:-6px;z-index:-10}.dbox input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:68px;width:186px;margin-top:0;display:block;background-color:transparent;color:transparent;margin:10px auto 10px auto;padding:0}.dbox span{float:left;padding-right:0}.dbox div label{padding:0 10px 0 0}.dbox h6#ppinfo{width:100%;text-align:center;margin:-15px auto 0 auto}.dbox small,.dbox.donate #ppinfo{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:normal}.dbox.dl{float:none;width:177px;margin:0 5px 20px 5px}.dbox.dl input.amount{width:87px}.dbox.donate{float:none;padding:30px 30px;width:626px;min-height:0;max-width:none;text-align:left}.dbox.donate input,.dbox.donate select{padding-bottom:0;margin-bottom:0}.dbox.donate .drow{margin:0 0 0 20px}.dbox.donate .drow div{padding:0;width:auto;display:block}.dbox.donate h3{padding-left:0;color:#23300e;margin:0 0 10px 0}.dbox.donate h4{padding-left:20px}.dbox.donate p{padding:5px 20px 15px 40px}.dbox.donate span{float:left;padding-right:0}.dbox.donate div label{padding:0 10px 0 0}.dbox.donate .type{padding-left:20px}.dbox.donate select#t3{width:auto;margin-bottom:0}.dbox.donate ul.amounts{width:auto}.dbox.donate ul.amounts li{display:inline-block}.dbox.donate ul.amounts li label{padding:0 0 0 5px}.dbox.donate input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:26px;width:115px;margin-top:-3px;display:inline-block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall{position:relative;display:inline-block;width:170px;height:140px;text-align:center;margin:0 10px;vertical-align:top}.dbox.dsmall input.donate-btn{background:url() left top no-repeat transparent;width:auto;height:auto;margin-top:0;display:block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall div label{padding:0}.dbox.dsmall small{display:block;position:absolute;width:172px;float:none;bottom:20px;margin:0 auto}.givv p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}dwolla p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}div.blogRow,div.blogFirstRow{height:40px;padding:3px 10px;margin:0}div.blogLastRow{height:20px;text-align:center}div.blogFirstRow{height:22px;background:url(../images/table-head.jpg) left top repeat-x #885ca4}.blogRow:hover{background:#f6ffd5}div.blogRow1,div.blogRow3{background:#eee8f1}.blogFeed a{text-decoration:none}.blogFeed p{margin:0;font-size:12px}p.blogTitle{font-weight:bold;text-decoration:underline}p.blogAuthor{color:#000;text-align:right;margin-top:-20px}p.blogAuthor em{color:#4e6a20;text-align:right;margin-top:-20px}p.blogDate{color:#000}.blogFeed h2{font-size:1.467em;margin:0;line-height:23px;color:#f6f6ed}#projectpage td{width:50%}.projectbox{width:710px;position:relative;margin-bottom:80px}.projectbox .name{font-size:1.5em;font-weight:bold}.projectbox a img{float:none;position:absolute;top:0;left:0}.projectbox .projectdesc{margin-left:100px}.clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden}.clearfix{display:inline-block}/*\*/* html .clearfix{height:1%}.clearfix{display:block}/**/.joblink{display:block;font-size:128%;font-weight:bold;padding:10px 5px;text-align:right}.joblink a{text-decoration:none}.dropbtn{background-color:white;padding:16px 0 0 0;font-size:100%;border:0;cursor:pointer}.dropdown{position:relative;display:inline-block;padding:0;margin-top:-16px;top:0}.dropdown-content{display:none;position:absolute;background-color:#f9f9f9;box-shadow:0 8px 16px 0 rgba(0,0,0,0.2);z-index:1;margin:48px 0 0 0}.dropdown-content a{color:black;padding-top:12px 16px;text-decoration:none;display:block}.dropdown:hover .dropdown-content{display:block}@font-face{font-family:Source Sans Pro;src:url('fonts/SourceSansPro/SourceSansPro-Regular.ttf')}@font-face{font-family:Source Sans Pro Light;src:url('fonts/SourceSansPro/SourceSansPro-Light.ttf')}@font-face{font-family:Source Sans Pro Bold;src:url('fonts/SourceSansPro/SourceSansPro-Bold.ttf')}@font-face{font-family:Source Serif Pro;src:url('fonts/SourceSerifPro/SourceSerifPro-Regular.ttf')}@font-face{font-family:Source Code Pro;src:url('fonts/SourceCodePro/SourceCodePro-Regular.ttf')}.eoy-background{background-color:#f8f9fa;width:100%;height:300px;margin-bottom:35px}.eoy-wrap{width:960px;margin:auto;padding-top:20px}.eoy-artwork{width:40%;background:url(../images/artwork@2x.png) left bottom no-repeat;background-size:contain;float:left;height:280px}.eoy-message{width:55%;float:right;padding-left:35px}.advance-universal-hu{color:#420c5d;font-family:Source Sans Pro;font-size:24px;font-weight:600;line-height:29px;text-align:left}.tor-strength-in-num{color:#55246d;font-family:Source Sans Pro;font-size:12px;font-weight:600;line-height:14px;text-align:left}.give-today-and-mozi{color:#420c5d;font-family:Source Sans Pro;font-size:13px;font-weight:400;line-height:16px;text-align:left}.tor-strength-in-num>p.title{text-transform:uppercase}.keep-tor-strong-giv{color:#420c5d;font-family:Source Sans Pro;font-size:24px;font-weight:600;line-height:29px;text-align:left}.keep-tor-strong-giv>span{font-size:60%}.eoy-btn-container{padding-top:5%;padding-bottom:5%}.eoy-btn{background-color:#420c5d;border-radius:3px;width:120px;height:35px;padding:10px;padding-left:20px;padding-right:20px}.count-me-in{color:#fff !important;font-family:Source Sans Pro;font-size:14px;font-weight:600;line-height:17px;text-align:center}mark{background:cyan}.accordion{margin:10px auto 30px auto}.accordion pre{padding:15px;line-height:150%}.accordion .hint{color:grey;font-size:90%}.accordion input{display:none}.accordion label:hover,.accordion input:checked+label,.accordion input:checked+label:hover{text-shadow:0 1px 1px rgba(255,255,255,0.6)}.accordion label{padding:5px 0;position:relative;z-index:19;display:block;cursor:pointer;text-shadow:1px 1px 1px rgba(255,255,255,0.8);background:linear-gradient(top,#fff 1%,#bda5cc 100%)}.accordion label a{color:#66a516}.accordion div.nav{right:50px}.accordion .nav{float:right;max-width:400px;text-decoration:none}.accordion .nav ul{list-style:none;text-align:right}.accordion .nav hint{font-size:-50%}.accordion article{height:0;overflow:hidden;position:relative;z-index:10;transition:height .3s ease-in-out,box-shadow .6s linear}.accordion .ac-box input:active ~ label p a,.accordion .ac-box input:checked ~ label p a{font-weight:bold;color:red;text-decoration:underline}.accordion div:hover ~ article,.accordion div:active ~ article,.accordion input:checked ~ article{height:100%;transition:height .5s ease-in-out,box-shadow .1s linear}.accordion input:active ~ article.ac-box .accordion input:checked ~ article.ac-box{-background:grey;border:solid 1px #66a516;padding:15px;margin-bottom:30px}.accordion article h4{margin:15px}.accordion article.ac-box label,.accordion article.ac-box label h4{display:inline}.dlcontent{margin:25px;font-family:sans-serif}.dlcontent h1{padding:25px;text-align:center;margin:10px 50px}.dlcontent section>p{margin-left:50px}.tor-source,.dlcontent .nav{float:left}.dlcontent .nav ul{list-style:none;margin:0}.dlcontent .nav li{display:block;margin:0;padding:0;font-size:1em;font-weight:bold;height:33px;border-top-left-radius:7px;border-top-right-radius:7px;width:250px;background:url("../images/table-title.jpg") repeat-x left bottom #885ca4}.dlcontent .nav li a{color:#fff}.accordion.download label{margin-left:25px;padding-left:30px}.accordion.download input:checked ~ article{padding:20px;border:solid 1px #66a516}.dltor,section#torbrowser .os,section#torbrowser .lang{clear:both}table#packages th{padding:10px}.tblang th{text-align:center;font-weight:bold}.accordion.download article h2{font-family:sans-serif;font-size:2em;text-align:center;margin:25px} \ No newline at end of file diff --git a/docs/en/debian.wml b/docs/en/debian.wml index feefa5c6..8fdfbb82 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -178,8 +178,8 @@ or whatever it is) in place of <DISTRIBUTION>.

If you want to use the -development branch -of Tor instead (more features and more bugs), you need add a different set of +development branch +of Tor instead (more features and more bugs), you need to add a different set of lines to your /etc/apt/sources.list file:

 deb     https://deb.torproject.org/torproject.org <DISTRIBUTION> main
diff --git a/docs/en/faq.wml b/docs/en/faq.wml
index c622e69c..636ea63c 100644
--- a/docs/en/faq.wml
+++ b/docs/en/faq.wml
@@ -813,7 +813,7 @@
     it sends. Tor Browser tries to keep application-level data,
     like the user-agent string, uniform for all users. Tor Browser can't
     do anything about text that you type into forms, though. Be
+    href="#warning">Be
     careful and be smart.
     

 
@@ -1408,7 +1408,7 @@
 
     

     First (best option), if you're on Linux, you can install the
-    system Tor package
+    system Tor package
     (e.g. apt-get install tor) and then set it up to be a relay
     (instructions).
     You can then use TBB independent of that.
diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index eda44e00..2a3fb25a 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -112,7 +112,7 @@
 
     
Currently deployed PTs

 
-    
These Pluggable Transports are currently deployed in Tor Browser, and you can start using them by downloading and using Tor Browser.
+    
These Pluggable Transports are currently deployed in Tor Browser, and you can start using them by downloading and using Tor Browser.
     

 
       
    
diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml
deleted file mode 100644
index bbc73fb2..00000000
--- a/download/en/download-easy.wml
+++ /dev/null
@@ -1,361 +0,0 @@
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 3-low
-
-#
-#
-
-#
-#
-en-US
-
-#
-Tor Browser
-Windows 64-bit
-Tor Browser
-Tor Browser
-Linux 64-bit
-
-#include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8"
-
-
    
-	
-	
-	
    
-		
    Want Tor to really work?
    
-		
    You need to change some of your habits, as some things won't work exactly as you are used to. Please read the full list of warnings for details.
    
-	
    
-	
-	
    
-		
-		
-
-
-
-
    
-
-      
    
-	
    
-	  
    
-	    
    Tor Browser for Windows (64 bit)
    
-	    Version  - Windows 10, 8, and 7
-	    
    Everything you need to safely browse the Internet. 
    Learn more »
    
-	  
    
-	  
    
-	    Download
-	    
-	    
    
-	      Other Languages
-	      (sig) What's This?
-	    
    
-	  
    
-	  
    Not Using Windows?
    Download for Mac or Linux
    
-	
    
-      
    
-
-      
    
-	
    
-	  
    
-	    
    Tor Browser for Windows
    
-	    Version  - Windows 10, 8, and 7
-	    
    Everything you need to safely browse the Internet. 
    Learn more »
    
-	  
    
-	  
    
-	    Download
-	    
-	    
    
-	      Other Languages
-	      (sig) What's This?
-	    
    
-	  
    
-	  
    Not Using Windows?
    Download for Mac or Linux
    
-	
    
-      
    
-
-      
    
-	
    
-	  
    
-	    
    Tor Browser for Mac
    
-	    Version  - OS X (10.9+) Read the release announcements!
-	    
    Everything you need to safely browse the Internet.
    Learn more »
    
-	  
    
-	  
    
-	    Download
-	    
-	    
    
-	      Other Languages
-	      (sig) What's This?
-	    
    
-	  
    
-	  
    Not Using Mac? Download for Windows or Linux
    
-        
    
-      
    
-
-      
    
-	
    
-	  
    
-	    
    Tor Browser for Linux (64-Bit)
    
-	    Version  - Linux (64-Bit) Read the release announcements!
-	    
    Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.
    Learn more »
    
-	  
    
-	  
    
-	    Download
-	    
-	    
    
-	      Other Languages
-	      (sig) What's This?
-	    
    
-	  
    
-	  
    Not Using Linux? Download for Mac or Windows
    
-	
    
-      
    
-
-      
    
-	
    
-	  
    
-	    
    Tor Browser for Linux (32-Bit)
    
-	    Version  - Linux (32-Bit) Read the release announcements!
-	    
    Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.
    
-	    Learn more »
    
-	  
    
-	  
    
-	    Download
-	    
-	    
    
-	      Other Languages
-	      (sig) What's This?
-	    
    
-	  
    
-	  
    Not Using Linux? Download for Mac or Windows
    
-	
    
-      
    
-
-
-  
    
-    
    
-      
    
-        
    Running Tor on OpenBSD
    
-	
    These are installation instructions for running Tor Browser in a OpenBSD environment.
    
-	
    To install from OpenBSD's packages, run:
    
-
-
-        
    pkg_add tor-browser
    
-
-	
    Sometimes the most recent version of Tor Browser on OpenBSD is behind the current release. The available version of TB on OpenBSD should be checked with:
-
-	
    pkg_info -Q tor-browser
    
-
-	
    If provided version is not the current Tor Browser version, it is not recommended.
    
-
-        
    To install the Tor Browser port from an updated ports tree, run:
    
-
-        
    cd /usr/ports/meta/tor-browser && make install
    
-      
    
-    
    
-  
    
-
-  
    
-    
    
-      
    
-	  
    Tor Browser for Android
    
-          
    Tor Browser for Android has only be released in alpha-version. 
    
-					You can download the alpha release on GooglePlay or from
-					our alpha download list.
-					
    
-
-      
    
-    
    
-  
    
-
-      
    Looking For Something Else? View All Downloads
    
-
    
-
     
-
-
-
-
-
    
-
-
     
-
-
-
-	
     
-	
    
-
-
    
-
-
-
    Want Tor to really work?
    
-
    You need to change some of your habits, as some things won't work
-exactly as you are used to.
    
-
-
      
-
-
    1. Use Tor Browser
-
      Tor does not protect all of your computer's Internet traffic when you
-run it. Tor only protects your applications that are properly configured
-to send their Internet traffic through Tor. To avoid problems with
-Tor configuration, we strongly recommend you use the Tor Browser. It is pre-configured to
-protect your privacy and anonymity on the web as long as you're browsing
-with Tor Browser itself. Almost any other web browser configuration
-is likely to be unsafe to use with Tor.
      
-
      2. 
-
    2. Don't torrent over Tor
-
      
-Torrent file-sharing applications have been observed to ignore proxy
-settings and make direct connections even when they are told to use Tor.
-Even if your torrent application connects only through Tor, you will
-often send out your real IP address in the tracker GET request,
-because that's how torrents work. Not only do you 
-deanonymize your torrent traffic and your other simultaneous Tor web
-traffic this way, you also slow down the entire Tor network for everyone else.
-
      
-
      3. 
-
    3. Don't enable or install browser plugins
-
      Tor Browser will block browser plugins such as Flash, RealPlayer,
-Quicktime, and others: they can be manipulated into revealing your IP
-address.  Similarly, we do not recommend installing additional addons or
-plugins into Tor Browser, as these may bypass Tor or otherwise harm
-your anonymity and privacy.
      
-
      4. 
-
-
    4. Use HTTPS versions of websites
-
      Tor will encrypt your traffic to
-and within the Tor network, but the encryption of your traffic to
-the final destination website depends upon on that website. To help
-ensure private encryption to websites, Tor Browser includes
-HTTPS Everywhere
-to force the use of HTTPS encryption with major websites that
-support it. However, you should still watch the browser URL bar to
-ensure that websites you provide sensitive information to display a blue
-or green URL bar button, include https:// in the URL, and
-display the proper expected name for the website.
-Also see EFF's interactive page
-explaining how Tor
-and HTTPS relate.
-
      
-
      5. 
-
-
    5. Don't open documents downloaded through Tor while online
-
      Tor Browser will warn you before automatically opening
-documents that are handled by external applications. DO NOT
-IGNORE THIS WARNING.  You should be very careful when downloading
-documents via Tor (especially DOC and PDF files, unless you use the PDF
-viewer that's built into Tor Browser) as these documents
-can contain Internet resources that will be downloaded outside of
-Tor by the application that opens them. This will reveal your non-Tor
-IP address. If you must work with DOC and/or PDF files, we strongly
-recommend either using a disconnected computer, downloading the free VirtualBox and using it with a virtual machine image with networking
-disabled, or using Tails.
-Under no circumstances is it safe to use BitTorrent
-and Tor together, however.
      
-
      6. 
-
-
    6. Use bridges and/or find company
-
      Tor tries to prevent attackers from learning what destination websites
-you connect to. However, by default, it does not prevent somebody
-watching your Internet traffic from learning that you're using Tor. If
-this matters to you, you can reduce this risk by configuring Tor to use a
-Tor bridge relay rather than connecting
-directly to the public Tor network.  Ultimately the best protection is
-a social approach: the more Tor users there are near you and the more
-diverse their interests, the less
-dangerous it will be that you are one of them. Convince other people to
-use Tor, too!
      
-
      7. 
-
    
-
    
-
    Be smart and learn more. Understand what Tor does and does not offer.
-This list of pitfalls isn't complete, and we need your help identifying and documenting all
-the issues.

    
-
    Where else can I get Tor?
    
-
    In some countries the Tor Project website is blocked or censored and
-it is not possible to download Tor directly. The Tor Project hosts a
-Tor Browser mirror on Github.

    
-
    Using the GetTor service is
-another way to download Tor Browser when the Project website and mirrors
-are blocked.
    
-
-
    
-
-
    
-
-
-
    
-
    
-
    
-
-
    
-
    
-
-
    
-
    
-
    Having Trouble?
    
-
-
    
-
    
-
-
    
-
-
    
-
-
-#include 
diff --git a/download/en/download-unix.wml b/download/en/download-unix.wml
deleted file mode 100644
index 5d4d66ec..00000000
--- a/download/en/download-unix.wml
+++ /dev/null
@@ -1,183 +0,0 @@
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 3-low
-
-#include "head.wmi" TITLE="Tor: Download for Linux/Unix" CHARSET="UTF-8"
-
-    
    
-			
-    	
    
-      	
    Download Tor for Unix, Linux, BSD
    
-
-        
-      	
    
-          
    Want Tor to really work?
    
-            
    ...then please don't just install it and go on.
-            You need to change some of your habits, and reconfigure
-            your software! Tor by itself is NOT all you need
-            to maintain your anonymity. Read the full
-            list of warnings.
    
-        
    
-        
-        
-
-
-  
-  
-  
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    PlatformDownload StableDownload UnstableInstallation and Configuration
    Debian Ubuntu KnoppixDebian, Ubuntu, Knoppixrepository packages  Linux/BSD/Unix 
    CentOS FedoraCentOS and Fedorayum install tor / dnf install tor Linux/BSD/Unix 
    Gentoo LinuxGentoo Linuxemerge tor
-Linux/BSD/Unix
    
-
    FreeBSDFreeBSDpkg install torLinux/BSD/Unix
    OpenBSDOpenBSDpkg_add tor
-Linux/BSD/Unix
    
-Guide to chrooting Tor in OpenBSD
-
    NetBSDNetBSDcd /usr/pkgsrc/net/tor && make installLinux/BSD/Unix
    Source codeSource tarballs
-
- (sig)
-
-
- (sig)
-./configure && make && src/or/tor (or src/app/tor starting in 0.3.5.x)
    
-
-
    
-
-
    What's the difference between Stable & Unstable?
    
-
-
    
-Stable packages are released when we believe the features and code will
-not change for many months.
-
    
-
    
-Unstable packages are released so you can help us test new features and bugfixes. Even though they have a higher version number
-than the stable versions listed above, there is a much higher chance of
-serious reliability and security bugs in these downloads.  Please be prepared to report bugs.
-
    
-
    
-
-
    
-
    
-
    
-Tor is distributed as Free Software
-under the 3-clause BSD license.
-
    
-
    
-There is no fee for installing Tor, or using the Tor network, but
-if you want Tor to become faster and more usable please consider
-making a tax-deductible donation to The Tor Project.
-
    
-
    
-
-
    
-
    
-
    
-To keep informed of security advisories and new stable releases, subscribe
-to the tor-announce
-mailing list (you will be asked to confirm via email). You can also
-watch
-the list's RSS feed.
-
    
-
    
-
-
    
-If you would like to research any past release of Tor source, packages,
-or other binaries, see the
-archive.
-
    
-
-
    
-
    
-If you have trouble downloading Tor from this site, here is a list of sites mirroring the Tor site.
-
    
-
-
-
-
-
    
-For a list of what has changed in each stable Tor release, see the
-ReleaseNotes. For a list of
-changes in both stable and development versions, see the
-ChangeLog.
-
    
-
    
-      
    
-      
-      
    
-        
    
-          
    
-          	
    Verify Signatures
    
-            
    Verify your downloads with our GPG signatures:
    
-            Read how to
-verify the signatures.
-          
    
-        
    
-        
-        
    
-        	
    
-          	
    Having Trouble?
    
-          	
-          
    
-      	
    
-        
-      
    
-      
-    
    
-    
-
-
-#include 
diff --git a/download/en/download.wml b/download/en/download.wml
index ff40c486..abb6f177 100644
--- a/download/en/download.wml
+++ b/download/en/download.wml
@@ -19,7 +19,7 @@
 
 #include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8"
 
-
    
+
    
   
   
    
 
@@ -30,64 +30,266 @@ you are used to. Please read the full list of warnings fo
 	
    
       
    
 
+
 
+
+
+ 
    
+  
    Download Tor
    
+  
    
+    
+    For a list of what has changed in each stable Tor release, see the
+    ReleaseNotes.
    
+    For a list of changes in both stable and development versions, see the
+    ChangeLog.
+  
    
+  
    
+  
+  
+  
    
+
+
+  
    
+   
+   
    
+
+
+
+
+  
+  
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    PlatformDownload StableDownload UnstableInstallation and Configuration
    Debian Ubuntu KnoppixDebian, Ubuntu, Knoppixrepository packages  Linux/BSD/Unix 
    CentOS FedoraCentOS and Fedorayum install tor / dnf install tor Linux/BSD/Unix 
    Gentoo LinuxGentoo Linuxemerge tor
+Linux/BSD/Unix
    
+
    SlackwareSlackwareSlackBuilds.org
+Linux/BSD/Unix
    
+
    FreeBSDFreeBSDpkg install torLinux/BSD/Unix
    OpenBSDOpenBSDpkg_add tor
+Linux/BSD/Unix
    
+Guide to chrooting Tor in OpenBSD
+
    NetBSDNetBSDcd /usr/pkgsrc/net/tor && make installLinux/BSD/Unix
    Source codeSource tarballs
+
+ (sig)
+
+
+ (sig)
+./configure && make && src/or/tor (or src/app/tor starting in 0.3.5.x)
    
+   
    
+  
    
+
+
+  
    
+   
+   
+
+
    
+
    
+
+
+
+ 
    Download Tor Browser
    
+ 
    
+
+  
    Everything you need to safely browse the Internet. Learn more »
    
+  Read the release announcements!
    
+
+  
    
+   
+  
+  
+  
    
+
 
-      
    
-	Microsoft Windows
-      
    
-      
    
-	
    
-
-#
-	
    
+ 
    
+   
+   
    
+     
    Tor Browser for Windows
    
+
+     
    
+	  
    
+	    
    64 Bit - Windows 10, 8, and 7
    
+	    Version  ()
+	  
    
 	  
    
-	    Download
+	    
+            Download
 	    
 	    
    
-	      Other Languages
-	      (sig) What's This?
+	      
+              Other Languages
+	      (
+              sig) What's This?
 	    
    
-	    Download Unstable
    
+	  
    
+    
    
+
+    
    
+	  
    
+	    
    32 Bit - Windows 10, 8, and 7
    
+	    Version  ()
+	  
    
+	  
    
 	    Download
 	    
 	    
    
 	      Other Languages
-	      (sig) What's This?
+	      (
+              sig) What's This?
 	    
    
 
 	  
    
-
-	  
    Tor Browser
    
-	  Version  () - Windows 10, 8, and 7
-	  
    Everything you need to safely browse the Internet. Learn more »
    
-	
    
-
-	
    
+    
    
+
+    
    
+	  
    
+	    
    Expert Bundle
    
+	    Version  ()
+	  
    
 	  
    
-	    DownloadExpert Bundle
+	    
+            DownloadExpert Bundle
 	    
    
-	      (sig) What's This?
+	      (sig)
+             What's This?
 	    
    
 	  
    
-
-	  
    Expert Bundle
    
-	  Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE
-	  
    Contains just Tor and nothing else. You'll need to configure Tor and all of your applications manually. This installer must be run as Administrator.
    
-	
    
-      
    
+	  
    
+          Contains just Tor and nothing else. You'll need to configure Tor and
+          all of your applications manually. This installer must be run as
+          Administrator.
+          
    
+          
    
+          For Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE.
+          
    
+     
    
+   
+  
    
 
+
 
-      
    
-	Apple OS X
    
-      
    
-	
    
-
-#
-	
    
+ 
    
+   
+   
    
+        
    Tor Browser for Mac OS X
    
+	
    
+	  
    
+	    Version  - OS X (10.9+) 
+	  
    
 	  
    
 	    Download
 	    
+   
    
+     
    Tor Browser for Linux
    
+
+	
    
+	  
    
+	    
    64 Bit
    
+	    Version  - Linux, BSD, and Unix<
+	  
    
 	  
 	    Download
 	    
-	    
    
+	    
    
 	      Other Languages
 	      (sig) What's This?
 	    
    
-	    Download Unstable
    
-
-
+	  
+      
    
+
+	
    
+	  
    
+	    
    32-Bit
    
+	    Version  - Linux, BSD, and Unix<
+	  
    
+	  
    
 	    Download
 	    
-	    
    
+	    
    
 	      Other Languages
 	      (sig) What's This?
 	    
    
-
-
 	  
-
-	  
    Tor Browser
    
-	  Version  () - Linux, BSD, and Unix
-	  
    Everything you need to safely browse the Internet. This
-package requires no installation. Just extract it and run. Learn more »
    
-
-	
    
-	  
    
-	    Tor repositories.
-	  
    
-
-	  
    Tor (standalone)
    
-	  
    Install the Tor components yourself, run a relay, create
-custom configurations. All an apt-get or yum install away.
    
-	
    
-	
    
       
    
+   
    
+  
    
 
-
-      
    
-        Android
+
+ 
    
+   
+   
    
+      
    
+     
    Tor Browser for OpenBSD
    
+	
    
+        To install Tor Browser on OpenBSD, run:
    
+        
    pkg_add tor-browser
    
+
+	
    
+        Sometimes the most recent version of Tor Browser on OpenBSD is
+        behind the current release.
    
+        The available version of TB on OpenBSD should be checked with:
+        
    
+	
    pkg_info -Q tor-browser
    
+	
    
+        If provided version is not the current Tor Browser version, it is
+        not recommended. To install the Tor Browser port from an updated ports
+        tree, run:
    
+        
    cd /usr/ports/meta/tor-browser && make install
    
       
    
-      
    
-        
    
-	
    
-          
    
-            DownloadAndroid
-            
    
-              (sig)
-              What's This?
-            
    
-          
    
+   
    
+  
    
+
+
 
-	  
    Tor Browser
    
+
+
+ 
    
+   
+   
    
+     
    Tor Browser for Android
    
+	
    
+	  
    
+	    
    Stable
    
+	    
+	  
    
+          
    
+          Tor Browser for Android has no stable version yet.
+          It is expected for early 2019
+          
    
+          
    
+          You can help by testing the Alpha version and
+          reporting issues.
+          
    
+        
    
+  	
    
+          
    Alpha
    
           
    
           Introducing Tor Browser for Android, the mobile browser with the
           highest privacy protections ever available and on par with Tor
-          Browser for desktop. You can download the alpha release on
-          GooglePlay,
-          or you can get the apk by clicking on the button below.
+          Browser for desktop.
           
    
           
    
-          Note: For this release, you also need to install Orbot, you can
-          learn more about it here.
+          Note: For this release, you also need to install
+          Orbot.
           
    
+	  
    
+	    Version  - Android Read the release announcements!
    
+	  
    
+          
    
+            DownloadAndroid
+            
    
+              (sig)
+              What's This?
+            
    
+          
    
           
    
           Known issue: Our Security Slider is now under ‘Security Settings,
           but because of a small issue, it’s only showing up after you restart
-	  the app. We plan on fixing it for the next release.
+          the app. We plan on fixing it for the next release.
+          
    
+          
    Also available on
+          GooglePlay.
+          
           
    
        
    
-     
    
+   
    
+  
    
 
-
-
-      
    
-	Source Code
    
-      
    
-	
    
-	
    
-	  
    
-	    DownloadSource Code
-	    
    
-	      (sig) What's This?
-	    
    
-	    DownloadSource Code (Unstable)
-	    
    
-	      (sig) What's This?
-	    
    
-	  
    
+
+ 
    
+   
+   
    
+     
    iOS
    
+       
    
+       Unfortunately we do not have the capacity to offer a version of
+       Tor Browser for IOS at the moment, but
+       
+       we recommend Onion Browser. Check
+       prism-break
+       for security limitations of iOS.
+       
    
+
+   
    
+  
    
+
+
+  
    
+   
+   
+  
    
+
 
-	  
    Source Tarball
    
-	  
     Configure with: ./configure && make && src/or/tor (or src/app/tor starting in 0.3.5.x)
    
-	  
    The current stable version of Tor is . Its release notes are available.
    
-	  
    The current unstable/alpha version of Tor is . Its Changelog is available.
    
-	
    
-      
    
-      
    Expand All
    
-
-
-
    
-
-
    
-
-
-
    Want Tor to really work?
    
-	
    You need to change some of your habits, as some things won't work exactly as
-you are used to.
    
+
+ 
    
+   
+   
    
+     
    Tor Browser Stable
    
+    
    
+    Save the file for Tor Browser in your preferred language to wherever is
+    convenient, e.g. the Desktop or a USB flash drive.
+    
    
+    
    See our instructions on how to verify package signatures,
+      which allows you to make sure you've downloaded the file we intended
+      you to get. Also, note that the Firefox ESR in our bundles is
+      modified from the default
+      Firefox ESR.
    
+      
    
+        
+          
+        
+          
+          
+          
+          
+        
+          
+          
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+          
+        
    LanguageMicrosoft Windows ()Apple MacOS ()GNU/Linux ()
    English (en-US)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    العربية (ar)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Català (ca)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Dansk (da)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Deutsch (de)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Español (es-ES)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    فارسی (fa)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Français (fr)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Gaeilge (Irish) (ga-IE)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    עברית (he)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    bahasa Indonesia (id)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    íslenska (is)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Italiano (it)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    日本語 (ja)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Korean (ko)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Norsk bokmåͅl (nb-NO)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Nederlands (nl)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Polish (pl)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Português (pt-BR)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Русский (ru)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Svenska (sv-SE)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Türkçe (tr)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Vietnamese (vi)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    简体字 (zh-CN)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    正體字 (zh-TW)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    
 
-
      
-
    1. Use Tor Browser
+   
    
+  
    
+
+
+ 
    
+   
+   
    
+     
    Tor Browser Unstable
    
+    
    
+    Save the file for Tor Browser in your preferred language to wherever is
+    convenient, e.g. the Desktop or a USB flash drive.
+    
    
+    
    See our instructions on how to verify package signatures,
+      which allows you to make sure you've downloaded the file we intended
+      you to get. Also, note that the Firefox ESR in our bundles is
+      modified from the default
+      Firefox ESR.
    
+     
    
+      
    
+        
+          
+        
+          
+          
+          
+          
+          
+        
+          
+          
+        
+          
+          
+          
+           
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+        
    LanguageMicrosoft Windows ()Mac OS X ()Linux ()Android ()
    English (en-US)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)Android
+          (sig)
    العربية (ar)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Català (ca)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Dansk (da)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Deutsch (de)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Español (es-ES)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    فارسی (fa)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Français (fr)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Gaeilge (Irish) (ga-IE)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    עברית (he)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    bahasa Indonesia (id)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    íslenska (is)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Italiano (it)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    日本語 (ja)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Korean (ko)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Norsk bokmåͅl (nb)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Nederlands (nl)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Polish (pl)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Português (pt-BR)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Русский (ru)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Svenska (sv-SE)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Türkçe (tr)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    Vietnamese (vi)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    简体字 (zh-CN)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    正體字 (zh-TW)
+                32/64-bit
+                (sig)
+                •
+                64-bit
+                (sig)
+          64-bit
+          (sig)
+          32-bit
+          (sig)
+          • 64-bit
+          (sig)
    
+       
    
+     
    
+   
    
+  
    
+
+
    
+
 
-
    
 
-Tor does not protect all of your computer's Internet traffic when you
-run it. Tor only protects your applications that are properly configured to
-send their Internet traffic through Tor. To avoid problems with Tor
-configuration, we strongly recommend you use the
-Tor Browser. It is pre-configured to protect
-your privacy and anonymity on the web as long as you're browsing with Tor
-Browser itself. Almost any other web browser configuration is likely to be
-unsafe to use with Tor.
+
 
+
+
    
+
    License
    
+
    
+Tor is distributed as Free Software
+under the 3-clause BSD license.
 
    
-
-
-
-
  • Don't torrent over Tor
 
    
-Torrent file-sharing applications have been observed to ignore proxy
-settings and make direct connections even when they are told to use Tor.
-Even if your torrent application connects only through Tor, you will
-often send out your real IP address in the tracker GET request,
-because that's how torrents work. Not only do you 
-deanonymize your torrent traffic and your other simultaneous Tor web
-traffic this way, you also slow down the entire Tor network for everyone else.
+There is no fee for installing Tor, or using the Tor network, but
+if you want Tor to become faster and more usable please consider
+making a tax-deductible donation to The Tor Project.
 
    
-
    • 
+
    
 
-
  • Don't enable or install browser plugins
+
    
+
+
    What's the difference between Stable & Unstable?
    
 
 
    
-
-Tor Browser will block browser plugins such as Flash, RealPlayer,
-Quicktime, and others: they can be manipulated into revealing your IP address.
-Similarly, we do not recommend installing additional addons or plugins into
-Tor Browser, as these may bypass Tor or otherwise harm your anonymity and
-privacy.
-
+Stable packages are released when we believe the features and code will
+not change for many months.
 
    
-
-
    • 
-
-
  • Use HTTPS versions of websites
-
 
    
-
-Tor will encrypt your traffic
-to and
-within the Tor network, but the encryption of your traffic to the final
-destination website depends upon on that website. To help ensure private
-encryption to websites, Tor Browser includes HTTPS Everywhere to force the
-use of HTTPS encryption with major websites that support it. However, you
-should still watch the browser URL bar to ensure that websites you provide
-sensitive information to display a
-blue or
-green URL bar button, include https:// in the URL, and display the
-proper expected name for the website. Also see EFF's interactive page
-explaining how Tor
-and HTTPS relate.
-
+Unstable packages are released so you can help us test new features and bugfixes. Even though they have a higher version number
+than the stable versions listed above, there is a much higher chance of
+serious reliability and security bugs in these downloads.  Please be prepared to report bugs.
 
    
+
    • 
 
-
-
-
  • Don't open documents downloaded through Tor while online
+
    
 
+
    
+
    Security updates and alternative download options
    
 
    
-
-Tor Browser will warn you before automatically opening documents that are
-handled by external applications. DO NOT IGNORE THIS WARNING.  You
-should be very careful when downloading documents via Tor (especially DOC and
-PDF files, unless you use the PDF viewer that's built into Tor Browser) as
-these documents can contain Internet resources that will be downloaded outside
-of Tor by the application that opens them. This will reveal your non-Tor IP
-address. If you must work with DOC and/or PDF files, we strongly recommend
-either using a disconnected computer,
-downloading the free VirtualBox and
-using it with a virtual machine image
-with networking disabled, or using Tails.
-Under no circumstances is it safe to use
-BitTorrent
-and Tor together, however.
-
+To keep informed of security advisories and new stable releases, subscribe
+to the tor-announce
+mailing list (you will be asked to confirm via email). You can also
+watch
+the list's RSS feed.
 
    
 
-
    • 
-
-
  • Use bridges and/or find company
-
 
    
-
-Tor tries to prevent attackers from learning what destination websites you
-connect to. However, by default, it does not prevent somebody watching your Internet
-traffic from learning that you're using Tor. If this matters to you, you can
-reduce this risk by configuring Tor to use a Tor
-bridge relay rather than connecting directly to the public Tor network.
-Ultimately the best protection is a social approach: the more Tor
-users there are near you and the more
-diverse their interests, the less
-dangerous it will be that you are one of them. Convince other people to use
-Tor, too!
-
+If you would like to research any past release of Tor source, packages,
+or other binaries, see the
+archive.
 
    
 
-
    • 
-
-
-
    
 
    
-Be smart and learn more. Understand what Tor does and does not offer.
-This list of pitfalls isn't complete, and we need your
-help identifying and documenting
-all the issues.
+If you have trouble downloading Tor from this site, here is a list of sites mirroring the Tor site.
 
    
 
    
+
+
    
+
+#include 
 
 
 
 
 
    
-
    
-
    
-
    Jump To:
    
-
-
    
-
    
+ 
    
+  
    
+   
+  
    
+ 
    
 
-
+ 
 
 
-
    
-
    
-
    Having Trouble?
    
-
-
    
-
    
+ 
    
+  
    
+   
    Having Trouble?
    
+   
+  
    
+ 
    
 
 
    
 
diff --git a/en/index.wml b/en/index.wml
index 68003e49..be8587ac 100644
--- a/en/index.wml
+++ b/en/index.wml
@@ -16,7 +16,7 @@
           
    Protect your privacy. Defend yourself against network surveillance and traffic analysis.
    
 
       
       
diff --git a/en/navigation.wmi b/en/navigation.wmi
deleted file mode 100644
index 051a263e..00000000
--- a/en/navigation.wmi
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/wml
-
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 1-high
-
-<:
-    # path                              link text
-    my @navigation = (
-        'index'                        , 'Home',
-        'about/overview'              , 'About Tor',
-        'docs/documentation'          , 'Documentation',
-        'press/press'                 , 'Press',
-        ''                      , 'Blog',
-        ''                , 'Newsletter',
-	'about/contact'			, 'Contact',
-    );
-    my @donatenav = (
-        'index'                        , 'Home',
-        'about/overview'              , 'About Tor',
-        'about/contact'               , 'Contact',
-    );
-    my @calltoaction = (
-        'download/download-easy'                , 'Download',
-        'getinvolved/volunteer'            , 'Volunteer',
-        'donate/donate-button'                    , 'Donate',
-    );
-
-:>
diff --git a/en/navigation.wmi b/en/navigation.wmi
new file mode 120000
index 00000000..7e86d870
--- /dev/null
+++ b/en/navigation.wmi
@@ -0,0 +1 @@
+../include/navigation.wmi
\ No newline at end of file
diff --git a/include/links.wmi b/include/links.wmi
index 601f57b8..49dfa73b 100644
--- a/include/links.wmi
+++ b/include/links.wmi
@@ -1,7 +1,8 @@
 #!wml
 
 https://gitweb.torproject.org/tor.git/plain/
-?id=tor- 
+?id=tor-
+?id=tor-
 https://gitweb.torproject.org/tor.git?a=tree;hb=HEAD;f=
 https://gitweb.torproject.org/tor.git?a=tree;hb=HEAD
 https://svn.torproject.org/svn/website/trunk/
diff --git a/include/navigation.wmi b/include/navigation.wmi
index 456b4f04..031a947b 100644
--- a/include/navigation.wmi
+++ b/include/navigation.wmi
@@ -1,7 +1,7 @@
 #!/usr/bin/wml
 
 ## translation metadata
-# Revision: $Revision: 22069 $
+# Revision: $Revision$
 # Translation-Priority: 1-high
 
 <:
@@ -21,8 +21,8 @@
         'about/contact'               , 'Contact',
     );
     my @calltoaction = (
-        'download/download-easy'           , 'Download',
-        'getinvolved/volunteer'            , 'Get Involved',
+        'download/download'           , 'Download',
+        'getinvolved/volunteer'            , 'Volunteer',
         'donate/donate-button'             , 'Donate',
     );
 
diff --git a/include/versions.wmi b/include/versions.wmi
index 24a8b55e..5d6b9099 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,6 +1,11 @@
+# Tor
 0.3.4.8
+0.2.9.16
+0.3.4.5-rc
+0.3.4.6-rc
 0.3.5.3-alpha
 
+# Tor Browser - development branch
 maint-7.5
 
 # *** tor browser stable ***
@@ -42,8 +47,15 @@
 
 
 
+# Tor files
+tor-.tar.gz
+../dist/
 tor-.tar.gz
 ../dist/
+tor-.tar.gz
+../dist/
+tor-.tar.gz
+../dist/
 tor-.tar.gz
 ../dist/
 
diff --git a/include/warning.wmi b/include/warning.wmi
new file mode 100644
index 00000000..c6a5727b
--- /dev/null
+++ b/include/warning.wmi
@@ -0,0 +1,132 @@
+#! /usr/bin/wml
+<: use strict; :>
+<: use warnings; :>
+
+#
+
+
    
+
+
+
    Want Tor to really work?
    
+	
    You need to change some of your habits, as some things won't work exactly as
+you are used to.
    
+
+
      
+
    1. Use Tor Browser
+
+
      
+
+Tor does not protect all of your computer's Internet traffic when you
+run it. Tor only protects your applications that are properly configured to
+send their Internet traffic through Tor. To avoid problems with Tor
+configuration, we strongly recommend you use the
+Tor Browser. It is pre-configured to protect
+your privacy and anonymity on the web as long as you're browsing with Tor
+Browser itself. Almost any other web browser configuration is likely to be
+unsafe to use with Tor.
+
+
      
+
+
      2. 
+
+
    2. Don't torrent over Tor
+
      
+Torrent file-sharing applications have been observed to ignore proxy 
+settings and make direct connections even when they are told to use Tor. 
+Even if your torrent application connects only through Tor, you will 
+often send out your real IP address in the tracker GET request, 
+because that's how torrents work. Not only do you 
+deanonymize your torrent traffic and your other simultaneous Tor web 
+traffic this way, you also slow down the entire Tor network for everyone else. 
+
      
+
      3. 
+
+
    3. Don't enable or install browser plugins
+
+
      
+
+Tor Browser will block browser plugins such as Flash, RealPlayer,
+Quicktime, and others: they can be manipulated into revealing your IP address.
+Similarly, we do not recommend installing additional addons or plugins into
+Tor Browser, as these may bypass Tor or otherwise harm your anonymity and
+privacy.
+
+
      
+
+
      4. 
+
+
    4. Use HTTPS versions of websites
+
+
      
+
+Tor will encrypt your traffic
+to and
+within the Tor network, but the encryption of your traffic to the final
+destination website depends upon on that website. To help ensure private
+encryption to websites, Tor Browser includes HTTPS Everywhere to force the
+use of HTTPS encryption with major websites that support it. However, you
+should still watch the browser URL bar to ensure that websites you provide
+sensitive information to display a
+blue or
+green URL bar button, include https:// in the URL, and display the
+proper expected name for the website. Also see EFF's interactive page
+explaining how Tor
+and HTTPS relate.
+
+
      
+
+
      5. 
+
+
    5. Don't open documents downloaded through Tor while online
+
+
      
+
+Tor Browser will warn you before automatically opening documents that are
+handled by external applications. DO NOT IGNORE THIS WARNING.  You
+should be very careful when downloading documents via Tor (especially DOC and
+PDF files, unless you use the PDF viewer that's built into Tor Browser) as
+these documents can contain Internet resources that will be downloaded outside
+of Tor by the application that opens them. This will reveal your non-Tor IP
+address. If you must work with DOC and/or PDF files, we strongly recommend
+either using a disconnected computer,
+downloading the free VirtualBox and
+using it with a virtual machine image
+with networking disabled, or using Tails.
+Under no circumstances is it safe to use
+BitTorrent
+and Tor together, however.
+
+
      
+
+
      6. 
+
+
    6. Use bridges and/or find company
+
+
      
+
+Tor tries to prevent attackers from learning what destination websites you
+connect to. However, by default, it does not prevent somebody watching your Internet
+traffic from learning that you're using Tor. If this matters to you, you can
+reduce this risk by configuring Tor to use a 
+Pluggable Transport rather than connecting directly to the public Tor network.
+Ultimately the best protection is a social approach: the more Tor
+users there are near you and the more
+diverse their interests, the less
+dangerous it will be that you are one of them. Convince other people to use
+Tor, too!
+
+
      
+
+
      7. 
+
+
    
+
    
+
    
+Be smart and learn more. Understand what Tor does and does not offer.
+This list of pitfalls isn't complete, and we need your
+help identifying and documenting
+all the issues.
+
    
+
    
diff --git a/js/dlpage01.js b/js/dlpage01.js
index 39f8ca9a..a54eb4c6 100644
--- a/js/dlpage01.js
+++ b/js/dlpage01.js
@@ -1,32 +1,11 @@
 $(function(){
-  /* If javascript is enabled this hides all sections by default */
-  $(".easy").css('display', 'none');
   /* Only show language selector if javascript is enabled */
   $('.lang').css('display', 'block');
   $('.lang-alt').css('display', 'none');
-  $('.expander').css('display', 'block');
+  $('.expander').css('height', '100%');
   $('.sidenav').css('display', 'none');
 });
 
-/* Uses result of jquery.client to open the relevant section */
-function OScheck() {
-  var clientos = $.client.os;
-  if(clientos == "Linux"){
-    $('.easy.linux').css('display', 'block');
-  }else if(clientos == "Windows"){
-    $('.easy.windows').css('display', 'block');
-  }else if(clientos == "Mac"){
-      $('.easy.mac').css('display', 'block');
-  }else if(clientos == "Android"){
-    $('.easy.android').css('display', 'block');
-  }else{
-    $('.easy').css('display', 'block');
-  }
-}
-  $(function(){
-  OScheck();
-});
-
 /* Reset language default - needed in the event of returning to the page via back button */
 function resetAll() {
   var f = document.forms;
@@ -84,38 +63,4 @@ $(document).ready(function () {
       //goto that anchor by setting the body scroll top to anchor top
 //      $('html, body').animate({scrollTop:target_top}, 1000);
     });
-
-
-    // Bind an event to window.onhashchange
-    $(window).bind( 'hashchange', function(e) {
-
-      // Get the hash (fragment) as a string, with any leading # removed.
-      var url = $.param.fragment();
-
-      // Toggle the '.easy' divs to off
-      if(url == 'windows'|url == 'mac'|url == 'linux'|url == 'openbsd'|url == 'android'){
-
-	  $('.easy').css('display', 'none');
-      }
-
-      if(url == 'windows'){
-	$('.easy.windows').css('display', 'block');
-      } else if(url == 'mac'){
-	$('.easy.mac').css('display', 'block');
-      } else if(url == 'linux'){
-	  $('.easy.linux').css('display', 'block');
-      } else if(url == 'openbsd'){
-	$('.easy.bsd').css('display', 'block');
-      } else if(url == 'android'){
-  $('.easy.android').css('display', 'block');
-      } else {
-	  $('.easy').css('display', 'none');
-	  $(function(){OScheck();});
-      }
-    });
-
-    // Since the event is only triggered when the hash changes, we need to trigger
-    // the event now, to handle the hash the page may have loaded with.
-    $(window).trigger( 'hashchange' );
-
 });
diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 172ce411..f32f76e7 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -10,7 +10,7 @@
     Projects » 
     TorBrowser
   
-    
    
+    
-      
    
-      
    
-    
    Tor Browser Downloads
    
-    
    To start using Tor Browser, download the file
-    for your
-    preferred language. This file can be saved wherever is convenient,
-    e.g. the Desktop or a USB flash drive.
    
-    
    
-    
    Stable Tor Browser
    
-    
    
-      
    
-        
-          
-        
-          
-          
-          
-          
-        
-          
-          
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-          
-        

    Language    		Microsoft Windows
    ()    		Apple MacOS
    ()    		GNU/Linux
    ()
    English (en-US)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    العربية (ar)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Català (ca)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Dansk (da)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Deutsch (de)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Español (es-ES)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    فارسی (fa)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Français (fr)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Gaeilge (Irish) (ga-IE)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    עברית (he)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    bahasa Indonesia (id)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    íslenska (is)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Italiano (it)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    日本語 (ja)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Korean (ko)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Norsk bokmåͅl (nb-NO)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Nederlands (nl)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Polish (pl)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Português (pt-BR)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Русский (ru)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Svenska (sv-SE)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Türkçe (tr)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Vietnamese (vi)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    简体字 (zh-CN)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    正體字 (zh-TW)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    
-      
    
-      
    
-
    See our instructions on how to verify package signatures,
-      which allows you to make sure you've downloaded the file we intended
-      you to get. Also, note that the Firefox ESR in our bundles is
-      modified from the default
-      Firefox ESR
    
-
-    
    
-    
    
-    
    
-    
    Experimental Tor Browser
    
-     
    
-      
    
-        
-          
-        
-          
-          
-          
-          
-          
-        
-          
-          
-        
-          
-          
-          
-           
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-          
-        

    Language    		Microsoft Windows
    ()    		Mac OS X
    ()    		Linux
    ()    		Android
    ()
    English (en-US)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)Android
-          (sig)
    العربية (ar)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Català (ca)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Dansk (da)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Deutsch (de)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Español (es-ES)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    فارسی (fa)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Français (fr)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Gaeilge (Irish) (ga-IE)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    עברית (he)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    bahasa Indonesia (id)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    íslenska (is)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Italiano (it)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    日本語 (ja)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Korean (ko)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Norsk bokmåͅl (nb)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Nederlands (nl)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Polish (pl)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Português (pt-BR)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Русский (ru)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Svenska (sv-SE)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Türkçe (tr)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    Vietnamese (vi)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    简体字 (zh-CN)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    正體字 (zh-TW)
-                32/64-bit
-                (sig)
-                •
-                64-bit
-                (sig)
-          64-bit
-          (sig)
-          32-bit
-          (sig)
-          • 64-bit
-          (sig)
    
-      
    
-      
    
     
    
-