Browse code

download: merge in download-unix tor (#14686)

traumschule authored on 09/09/2018 22:10:02
Showing 11 changed files
... ...
@@ -816,14 +816,14 @@ table tr img {
816 816
     margin-bottom: 0px;
817 817
     }
818 818
 
819
-.warning {
819
+.note {
820 820
   float: left;
821 821
   _float: none;  /* Float works in all browsers but IE6 */
822 822
   padding: 25px 25px;
823 823
   margin-top: 4px;
824 824
   }
825 825
 
826
-  .warning p {
826
+  .note p {
827 827
     padding-left: 10px;
828 828
     }
829 829
 
... ...
@@ -1468,5 +1468,8 @@ p.blogDate {
1468 1468
   margin-left: 50px;
1469 1469
   padding-left: 50px;
1470 1470
 }
1471
-
1471
+.tor-source {
1472
+  margin-left:75px;
1473
+  float: left;
1474
+}
1472 1475
 /* END ACCORDION */
... ...
@@ -1 +1 @@
1
-@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)}.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}.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}.accordion.download label{margin-left:50px;padding-left:50px}
2 1
\ No newline at end of file
2
+@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)}.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}.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}.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}.accordion.download label{margin-left:50px;padding-left:50px}.tor-source{margin-left:75px;float:left}
3 3
\ No newline at end of file
... ...
@@ -178,8 +178,8 @@ or whatever it is) in place of <DISTRIBUTION>.
178 178
 
179 179
 <p>
180 180
 If you want to use the
181
-<a href="<page download/download-unix>#packagediff">development branch</a>
182
-of Tor instead (more features and more bugs), you need add a different set of
181
+<a href="<page download/download>#packagediff">development branch</a>
182
+of Tor instead (more features and more bugs), you need to add a different set of
183 183
 lines to your <i>/etc/apt/sources.list</i> file:<br />
184 184
 <blockquote><pre>
185 185
 deb     https://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
... ...
@@ -1408,7 +1408,7 @@
1408 1408
 
1409 1409
     <p>
1410 1410
     First (best option), if you're on Linux, you can install the
1411
-    <a href="<page download/download-unix>">system Tor package</a>
1411
+    <a href="<page download/download>#tor-package">system Tor package</a>
1412 1412
     (e.g. apt-get install tor) and then set it up to be a relay
1413 1413
     (<a href="https://www.torproject.org/docs/tor-relay-debian">instructions</a>).
1414 1414
     You can then use TBB independent of that.
... ...
@@ -31,7 +31,7 @@
31 31
 <!-- START DOWNLOADS -->
32 32
    <div id="dow-don-left">
33 33
   <div id="tor" style="padding: 15px">
34
-    Are you looking for the <a href="<page download/tor>">Tor source tarball</a>?
34
+    Are you looking for the <a href="<page download/download>">Tor source tarball</a>?
35 35
   </div>
36 36
 <!-- START WINDOWS -->
37 37
 <!-- START WINDOWS 64-Bit -->
38 38
deleted file mode 100644
... ...
@@ -1,195 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision$
3
-# Translation-Priority: 3-low
4
-
5
-#include "head.wmi" TITLE="Tor: Download for Linux/Unix" CHARSET="UTF-8"
6
-
7
-    <div id="content" class="clearfix">
8
-			<div id="breadcrumbs"><a href="<page index>">Home &raquo; </a><a href="<page download/download-unix>">Download</a></div>
9
-    	<div id="maincol-left">
10
-      	<h1>Download Tor for Unix, Linux, BSD</h1>
11
-
12
-        <!-- BEGIN TEASER WARNING -->
13
-      	<div class="warning">
14
-          <h2>Want Tor to really work?</h2>
15
-            <p>...then please don't just install it and go on.
16
-            You need to change some of your habits, and reconfigure
17
-            your software! Tor by itself is <em>NOT</em> all you need
18
-            to maintain your anonymity. Read the <a href="<page download/download>#warning">full
19
-            list of warnings</a>.</p>
20
-        </div>
21
-        <!-- END TEASER WARNING -->
22
-
23
-<p>Looking for a <a href="<page download/tor>">source tarball</a>?</p>
24
-
25
-        <table class="topforty">
26
-<thead>
27
-<tr bgcolor="#009933" style="color: white; ">
28
-  <th colspan="2">Platform</th>
29
-  <th>Download Stable</th>
30
-  <th>Download Unstable</th>
31
-  <th>Installation and Configuration</th>
32
-</tr>
33
-</thead>
34
-
35
-<tr>
36
-<td align="center"><img src="$(IMGROOT)/distros/debian.png" alt="Debian"> <img src="$(IMGROOT)/distros/ubuntu.png" alt="Ubuntu"> <img src="$(IMGROOT)/distros/knoppix.png" alt="Knoppix"></td>
37
-<td>Debian, Ubuntu, Knoppix</td>
38
-<td colspan="2"><a href="<page docs/debian>">repository packages</a> </td>
39
-<td> <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a> </td>
40
-</tr>
41
-
42
-<tr class="beige">
43
-<td align="center"><img src="$(IMGROOT)/distros/centos.png" alt="CentOS"> <img src="$(IMGROOT)/distros/fedora.png" alt="Fedora"></td>
44
-<td>CentOS and Fedora</td>
45
-<td colspan="2">yum install tor / dnf install tor</td>
46
-<td> <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a> </td>
47
-</tr>
48
-
49
-<tr>
50
-<td align="center"><img src="$(IMGROOT)/distros/gentoo.png" alt="Gentoo Linux"></td>
51
-<td>Gentoo Linux</td>
52
-<td colspan="2"><kbd>emerge tor</kbd></td>
53
-<td>
54
-<a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a><br>
55
-</td>
56
-</tr>
57
-
58
-<tr class="beige">
59
-<td align="center"><img height="40" src="$(IMGROOT)/distros/slackware.png" alt="Slackware"></td>
60
-<td>Slackware</td>
61
-<td colspan="2"><a href="https://slackbuilds.org/repository/14.2/network/tor/">SlackBuilds.org</a></td>
62
-<td>
63
-<a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a><br>
64
-</td>
65
-</tr>
66
-
67
-<tr>
68
-<td align="center"><img src="$(IMGROOT)/distros/freebsd.png" alt="FreeBSD"></td>
69
-<td>FreeBSD</td>
70
-<td colspan="2"><kbd>pkg install tor</kbd></td>
71
-<td><a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a></td>
72
-</tr>
73
-
74
-<tr class="beige">
75
-<td align="center"><img src="$(IMGROOT)/distros/openbsd.png" alt="OpenBSD"></td>
76
-<td>OpenBSD</td>
77
-<td colspan="2"><kbd>pkg_add tor</kbd></td>
78
-<td>
79
-<a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a><br>
80
-<a href="<wiki>doc/OpenbsdChrootedTor">Guide to chrooting Tor in OpenBSD</a>
81
-</td>
82
-</tr>
83
-
84
-<tr>
85
-<td align="center"><img src="$(IMGROOT)/distros/netbsd.png" alt="NetBSD"></td>
86
-<td>NetBSD</td>
87
-<td colspan="2"><kbd>cd /usr/pkgsrc/net/tor &amp;&amp; make install</kbd></td>
88
-<td><a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a></td>
89
-</tr>
90
-
91
-<tr class="beige">
92
-<td align="center"><img src="$(IMGROOT)/distros/terminal.png" alt="Source code"></td>
93
-<td>Source tarballs</td>
94
-<td>
95
-<a href="<package-source-stable>"><version-stable></a>
96
- (<a href="<package-source-stable>.asc">sig</a>)
97
-</td>
98
-<td>
99
-<a href="<package-source-alpha>"><version-alpha></a>
100
- (<a href="<package-source-alpha>.asc">sig</a>)
101
-</td>
102
-<td><kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd> (or src/app/tor starting in 0.3.5.x)</td>
103
-</tr>
104
-
105
-</table>
106
-
107
-<div class="nb">
108
-<a id="packagediff"></a>
109
-<h2><a class="anchor" href="#packagediff">What's the difference between Stable &amp; Unstable?</a></h2>
110
-
111
-<p>
112
-Stable packages are released when we believe the features and code will
113
-not change for many months.
114
-</p>
115
-<p>
116
-Unstable packages are released so you can help us test new features and bugfixes. Even though they have a higher version number
117
-than the stable versions listed above, there is a much higher chance of
118
-serious reliability and security bugs in these downloads.  Please be prepared to <a href="https://bugs.torproject.org/">report bugs</a>.
119
-</p>
120
-</div>
121
-
122
-<div class="underline"></div>
123
-<div class="nb">
124
-<p>
125
-Tor is distributed as <a href="http://www.fsf.org/">Free Software</a>
126
-under the <a href="<gitblob>LICENSE">3-clause BSD license</a>.
127
-</p>
128
-<p>
129
-There is no fee for installing Tor, or using the Tor network, but
130
-if you want Tor to become faster and more usable please consider
131
-<a href="<page donate/donate-download>">making a tax-deductible donation to The Tor Project</a>.
132
-</p>
133
-</div>
134
-
135
-<div class="underline"></div>
136
-<div class="nb">
137
-<p>
138
-To keep informed of security advisories and new stable releases, subscribe
139
-to the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce">tor-announce
140
-mailing list</a> (you will be asked to confirm via email). You can also
141
-<a href="http://rss.gmane.org/gmane.network.onion-routing.announce">watch
142
-the list's RSS feed</a>.
143
-</p>
144
-</div>
145
-
146
-<p>
147
-If you would like to research any past release of Tor source, packages,
148
-or other binaries, see <a href="https://archive.torproject.org/">the
149
-archive</a>.
150
-</p>
151
-
152
-<div class="nb">
153
-<p>
154
-If you have trouble downloading Tor from this site, here is a <a
155
-href="<page getinvolved/mirrors>">list of sites mirroring the Tor site</a>.
156
-</p>
157
-
158
-<a id="ChangeLog"></a>
159
-<a id="Stable"></a>
160
-<a id="Testing"></a>
161
-<p>
162
-For a list of what has changed in each stable Tor release, see the
163
-<a href="<gitblob>ReleaseNotes<cgitstable>">ReleaseNotes</a>. For a list of
164
-changes in both stable and development versions, see the
165
-<a href="<gitblob>ChangeLog">ChangeLog</a>.
166
-</p>
167
-</div>
168
-      </div>
169
-      <!-- END MAINCOL -->
170
-      <div id="sidecol-right">
171
-        <div class="img-shadow">
172
-          <div class="infoblock">
173
-          	<h2>Verify Signatures</h2>
174
-            <p>Verify your downloads with our GPG signatures:</p>
175
-            <a href="<page docs/verifying-signatures>">Read how to
176
-verify the signatures</a>.
177
-          </div>
178
-        </div>
179
-        <!-- END INFOBLOCK -->
180
-        <div class="img-shadow">
181
-        	<div class="sidenav-sub">
182
-          	<h2>Having Trouble?</h2>
183
-          	<ul>
184
-            	<li class="dropdown"><a href="#packagediff">What are the differences between stable and unstable downloads?</a></li>
185
-            </ul>
186
-          </div>
187
-      	</div>
188
-        <!-- END SIDENAV -->
189
-      </div>
190
-      <!-- END SIDECOL -->
191
-    </div>
192
-    <!-- END CONTENT -->
193
-
194
-
195
-#include <foot.wmi>
... ...
@@ -151,17 +151,6 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
151 151
 	  <p>Everything you need to safely browse the Internet. This
152 152
 package requires no installation. Just extract it and run. <a
153 153
 href="<page projects/torbrowser>">Learn more &raquo;</a></p>
154
-<!-- repo packages -->
155
-	<div class="package" style="border-bottom: 0px;">
156
-	  <div class="downloads">
157
-	    <a class="additional" style="font-weight: bold;"
158
-href="<page download/download-unix>">Tor repositories.</a>
159
-	  </div>
160
-
161
-	  <h2>Tor (standalone)</h2>
162
-	  <p>Install the Tor components yourself, run a relay, create
163
-custom configurations. All an apt-get or yum install away.</p>
164
-	</div>
165 154
       </div>
166 155
    </article>
167 156
   </div>
... ...
@@ -233,9 +222,10 @@ custom configurations. All an apt-get or yum install away.</p>
233 222
    </label>
234 223
    <article class="ac-small">
235 224
 	<div class="package" style="padding-top: 13px; border-top: 0px; border-bottom: 1px solid #888888;">
236
-          <p>Want to build <a href="<page download/tor>">Tor</a> or
237
-          <a href="<page projects/torbrowser>">Tor Browser</a> from source?
238
-          Read the <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorBrowser/Hacking">
225
+          <p>
226
+          To build <a href="<page projects/torbrowser>">Tor Browser</a>
227
+          from source see the
228
+          <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorBrowser/Hacking">
239 229
           Tor Browser Hacking Guide</a></p>
240 230
         </div>
241 231
    </article>
... ...
@@ -247,8 +237,209 @@ custom configurations. All an apt-get or yum install away.</p>
247 237
 </section>
248 238
 <!-- END TOR BROWSER -->
249 239
 
240
+<!-- START TOR -->
241
+ <h1>Download Tor</h1>
242
+ <section id="tor" class="accordion download">
243
+<!-- START TOR PACKAGE -->
244
+  <div id="tor-packages">
245
+   <input id="ac-tor-packages" name="accordion-tor-packages" type="checkbox" />
246
+   <label for="ac-tor-packages" class="source24">
247
+    <h1><a name="tor-packages">Packages</a></h1>
248
+   </label>
249
+   <article class="ac-small">
250
+
251
+<table class="topforty">
252
+<thead>
253
+<tr bgcolor="#009933" style="color: white; ">
254
+  <th colspan="2">Platform</th>
255
+  <th>Download Stable</th>
256
+  <th>Download Unstable</th>
257
+  <th>Installation and Configuration</th>
258
+</tr>
259
+</thead>
260
+
261
+<tr>
262
+<td align="center"><img src="$(IMGROOT)/distros/debian.png" alt="Debian"> <img src="$(IMGROOT)/distros/ubuntu.png" alt="Ubuntu"> <img src="$(IMGROOT)/distros/knoppix.png" alt="Knoppix"></td>
263
+<td>Debian, Ubuntu, Knoppix</td>
264
+<td colspan="2"><a href="<page docs/debian>">repository packages</a> </td>
265
+<td> <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a> </td>
266
+</tr>
267
+
268
+<tr class="beige">
269
+<td align="center"><img src="$(IMGROOT)/distros/centos.png" alt="CentOS"> <img src="$(IMGROOT)/distros/fedora.png" alt="Fedora"></td>
270
+<td>CentOS and Fedora</td>
271
+<td colspan="2">yum install tor / dnf install tor</td>
272
+<td> <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a> </td>
273
+</tr>
274
+
275
+<tr>
276
+<td align="center"><img src="$(IMGROOT)/distros/gentoo.png" alt="Gentoo Linux"></td>
277
+<td>Gentoo Linux</td>
278
+<td colspan="2"><kbd>emerge tor</kbd></td>
279
+<td>
280
+<a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a><br>
281
+</td>
282
+</tr>
283
+
284
+<tr class="beige">
285
+<td align="center"><img height="40" src="$(IMGROOT)/distros/slackware.png" alt="Slackware"></td>
286
+<td>Slackware</td>
287
+<td colspan="2"><a href="https://slackbuilds.org/repository/14.2/network/tor/">SlackBuilds.org</a></td>
288
+<td>
289
+<a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a><br>
290
+</td>
291
+</tr>
292
+
293
+<tr>
294
+<td align="center"><img src="$(IMGROOT)/distros/freebsd.png" alt="FreeBSD"></td>
295
+<td>FreeBSD</td>
296
+<td colspan="2"><kbd>pkg install tor</kbd></td>
297
+<td><a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a></td>
298
+</tr>
299
+
300
+<tr class="beige">
301
+<td align="center"><img src="$(IMGROOT)/distros/openbsd.png" alt="OpenBSD"></td>
302
+<td>OpenBSD</td>
303
+<td colspan="2"><kbd>pkg_add tor</kbd></td>
304
+<td>
305
+<a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a><br>
306
+<a href="<wiki>doc/OpenbsdChrootedTor">Guide to chrooting Tor in OpenBSD</a>
307
+</td>
308
+</tr>
309
+
310
+<tr>
311
+<td align="center"><img src="$(IMGROOT)/distros/netbsd.png" alt="NetBSD"></td>
312
+<td>NetBSD</td>
313
+<td colspan="2"><kbd>cd /usr/pkgsrc/net/tor &amp;&amp; make install</kbd></td>
314
+<td><a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a></td>
315
+</tr>
316
+
317
+<tr class="beige">
318
+<td align="center"><img src="$(IMGROOT)/distros/terminal.png" alt="Source code"></td>
319
+<td>Source tarballs</td>
320
+<td>
321
+<a href="<package-source-stable>"><version-stable></a>
322
+ (<a href="<package-source-stable>.asc">sig</a>)
323
+</td>
324
+<td>
325
+<a href="<package-source-alpha>"><version-alpha></a>
326
+ (<a href="<package-source-alpha>.asc">sig</a>)
327
+</td>
328
+<td><kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd> (or src/app/tor starting in 0.3.5.x)</td>
329
+</tr>
330
+
331
+</table>
332
+   </article>
333
+  </div>
334
+<!-- END TOR PACKAGE -->
335
+<!-- START TOR SOURCE -->
336
+  <div id="tor-source">
337
+   <input id="ac-tor-source" name="accordion-tor-source" type="checkbox" />
338
+   <label for="ac-tor-source" class="source24">
339
+    <h1><a name="tor-source">Source Tarballs</a></h1>
340
+   </label>
341
+   <article class="ac">
342
+           <p style="text-align:center">Build and run with: <code style="color: #666666;">./configure &amp;&amp; make &amp;&amp; src/or/tor</code> (or src/app/tor starting in 0.3.5.x)<br/>
343
+             See the <a href="<gitblob>ChangeLog">Changelog</a> for what's new.</p>
344
+           <div id="stable" style="margin-left:75px; float: left;">
345
+            <h2 style="text-align: center">Stable</h2>
346
+	    <a class="button" href="../dist/tor-<version-stable>.tar.gz"><span class="strong">Stable</span><span class="normal">Version <version-stable></span></a>
347
+	    <div class="sig">
348
+              <p>
349
+	      <a href="<gitblob>ReleaseNotes<cgitstable>">Release notes</a> &#x2012; <a href="../dist/tor-<version-stable>.tar.gz.asc">signature</a> &#x2012; <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
350
+              </p>
351
+	    </div>
352
+	    <a class="button" href="../dist/tor-<version-oldstable>.tar.gz"><span class="strong">Oldstable</span><span class="normal">Version <version-oldstable></span></a>
353
+	    <div class="sig">
354
+              <p>
355
+              <a href="<gitblob>ReleaseNotes<cgitoldstable>">Release notes</a> &#x2012; <a href="../dist/tor-<version-oldstable>.tar.gz.asc">signature</a> &#x2012; <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
356
+              </p>
357
+	    </div>
358
+           </div>
359
+           <div id="unstable" class="tor-source">
360
+            <h2 style="text-align: center">Unstable</h2>
361
+	    <a class="button" href="../dist/tor-<version-testing>.tar.gz"><span class="strong">Unstable</span><span class="normal">Version <version-testing></span></a>
362
+	    <div class="sig">
363
+	      <a href="../dist/tor-<version-testing>.tar.gz.asc">signature</a> &#x2012; <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
364
+	    </div>
365
+	    <a class="button" href="../dist/tor-<version-beta>.tar.gz"><span class="strong">Unstable</span><span class="normal">Version <version-beta></span></a>
366
+	    <div class="sig">
367
+	      <a href="../dist/tor-<version-beta>.tar.gz.asc">signature</a> &#x2012; <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
368
+	    </div>
369
+	    <a class="button" href="../dist/tor-<version-alpha>.tar.gz"><span class="strong">Unstable</span><span class="normal">Version <version-alpha></span></a>
370
+	    <div class="sig">
371
+	      <a href="../dist/tor-<version-alpha>.tar.gz.asc">signature</a> &#x2012; <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
372
+	    </div>
373
+   </article>
374
+   <div class="note">
375
+    <p>
376
+    <a id="ChangeLog"></a><a id="Stable"></a><a id="Testing"></a>
377
+    For a list of what has changed in each stable Tor release, see the
378
+    <a href="<gitblob>ReleaseNotes<cgitstable>">ReleaseNotes</a>. For a list of
379
+    changes in both stable and development versions, see the
380
+    <a href="<gitblob>ChangeLog">ChangeLog</a>.
381
+    </p>
382
+   </div>
383
+<!-- END TOR SOURCE -->
384
+</div>
385
+<!-- END TOR -->
386
+
250 387
 <!-- END DOWNLOADS -->
251 388
 <hr/>
389
+<!-- START NOTES-->
390
+<div class="note">
391
+<h2>License</h2>
392
+<p>
393
+Tor is distributed as <a href="http://www.fsf.org/">Free Software</a>
394
+under the <a href="<gitblob>LICENSE">3-clause BSD license</a>.
395
+</p>
396
+<p>
397
+There is no fee for installing Tor, or using the Tor network, but
398
+if you want Tor to become faster and more usable please consider
399
+<a href="<page donate/donate-download>">making a tax-deductible donation to The Tor Project</a>.
400
+</p>
401
+</div>
402
+
403
+<div class="note">
404
+<a id="packagediff"></a>
405
+<h2><a class="anchor" href="#packagediff">What's the difference between Stable &amp; Unstable?</a></h2>
406
+
407
+<p>
408
+Stable packages are released when we believe the features and code will
409
+not change for many months.
410
+</p>
411
+<p>
412
+Unstable packages are released so you can help us test new features and bugfixes. Even though they have a higher version number
413
+than the stable versions listed above, there is a much higher chance of
414
+serious reliability and security bugs in these downloads.  Please be prepared to <a href="https://bugs.torproject.org/">report bugs</a>.
415
+</p>
416
+</div>
417
+
418
+<hr/>
419
+
420
+<div class="note">
421
+<h2>Security updates and alternative download options</h2>
422
+<p>
423
+To keep informed of security advisories and new stable releases, subscribe
424
+to the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce">tor-announce
425
+mailing list</a> (you will be asked to confirm via email). You can also
426
+<a href="http://rss.gmane.org/gmane.network.onion-routing.announce">watch
427
+the list's RSS feed</a>.
428
+</p>
429
+
430
+<p>
431
+If you would like to research any past release of Tor source, packages,
432
+or other binaries, see <a href="https://archive.torproject.org/">the
433
+archive</a>.
434
+</p>
435
+
436
+<p>
437
+If you have trouble downloading Tor from this site, here is a <a
438
+href="<page getinvolved/mirrors>">list of sites mirroring the Tor site</a>.
439
+</p>
440
+</div>
441
+<!-- END NOTES -->
442
+<hr/>
252 443
 <!-- BEGIN WARNING -->
253 444
 #include <warning.wmi>
254 445
 <!-- END WARNING -->
255 446
deleted file mode 100644
... ...
@@ -1,249 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision$
3
-# Translation-Priority: 3-low
4
-
5
-#<!-- ATTENTION TRANSLATOR -->
6
-#<!-- You MUST copy '/include/lang.wmi' along with this file! -->
7
-
8
-#<!-- TBB DEFAULT LANGUAGE: Change 'en-US' below to your language code (if package exists)-->
9
-#<!-- IMPORTANT: You MUST also change the default selection in 'lang.wmi' -->
10
-<define-tag lang>en-US</define-tag>
11
-
12
-#<!-- Download button text for language enabled packages -->
13
-<define-tag button-win-tbb32>Tor Browser</define-tag>
14
-<define-tag button-win-tbb64>Currently Unused</define-tag>
15
-<define-tag button-osx-tbb64>Tor Browser</define-tag>
16
-#<!-- Comment out until it's available again. -EC <define-tag button-osx-tbb64>64-bit</define-tag> -->
17
-<define-tag button-lin-tbb32>Tor Browser (32-Bit)</define-tag>
18
-<define-tag button-lin-tbb64>Tor Browser (64-Bit)</define-tag>
19
-
20
-#include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8"
21
-
22
-<div id="content" class="clearfix" style="border-bottom: 1px solid #888888;">
23
-  <div id="breadcrumbs"><a href="<page index>">Home &raquo; </a><a href="<page download/download>">Download</a> &raquo; <a href="<page download/tor>">Tor</a></div>
24
-  <div id="maincol-left">
25
-<!-- BEGIN TEASER WARNING -->
26
-    <div class="warning-top">
27
-      <h2>Want Tor to really work?</h2>
28
-      <p>You need to change some of your habits, as some things won't work exactly as
29
-you are used to. Please read the <a href="#warning">full list of warnings</a> for details.
30
-      </p>
31
-    </div>
32
-<!-- END TEASER WARNING -->
33
-<!-- START DOWNLOADS -->
34
-	<div -class="package" style="padding-top: 35px;">
35
-	  <div -class="downloads">
36
-           <h1 style="text-align: center">Tor Source Tarballs</h1>
37
-           <p style="text-align:center">Build and run with: <code style="color: #666666;">./configure &amp;&amp; make &amp;&amp; src/or/tor</code><br/>
38
-             See the <a href="<gitblob>ChangeLog">Changelog</a> for what's new.</p>
39
-           <div id="stable" style="margin-left:75px; float: left;">
40
-            <h2 style="text-align: center">Stable</h2>
41
-	    <a class="button" href="../dist/tor-<version-stable>.tar.gz"><span class="strong">Stable</span><span class="normal">Version <version-stable></span></a>
42
-	    <div class="sig">
43
-              <p>
44
-	      <a href="<gitblob>ReleaseNotes<cgitstable>">Release notes</a> &#x2012; <a href="../dist/tor-<version-stable>.tar.gz.asc">signature</a> &#x2012; <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
45
-              </p>
46
-	    </div>
47
-	    <a class="button" href="../dist/tor-<version-oldstable>.tar.gz"><span class="strong">Oldstable</span><span class="normal">Version <version-oldstable></span></a>
48
-	    <div class="sig">
49
-              <p>
50
-              <a href="<gitblob>ReleaseNotes<cgitoldstable>">Release notes</a> &#x2012; <a href="../dist/tor-<version-oldstable>.tar.gz.asc">signature</a> &#x2012; <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
51
-              </p>
52
-	    </div>
53
-           </div>
54
-           <div id="unstable" style="margin-left:75px; float: left;">
55
-            <h2 style="text-align: center">Unstable</h2>
56
-	    <a class="button" href="../dist/tor-<version-testing>.tar.gz"><span class="strong">Unstable</span><span class="normal">Version <version-testing></span></a>
57
-	    <div class="sig">
58
-	      <a href="../dist/tor-<version-testing>.tar.gz.asc">signature</a> &#x2012; <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
59
-	    </div>
60
-	    <a class="button" href="../dist/tor-<version-beta>.tar.gz"><span class="strong">Unstable</span><span class="normal">Version <version-beta></span></a>
61
-	    <div class="sig">
62
-	      <a href="../dist/tor-<version-beta>.tar.gz.asc">signature</a> &#x2012; <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
63
-	    </div>
64
-	    <a class="button" href="../dist/tor-<version-alpha>.tar.gz"><span class="strong">Unstable</span><span class="normal">Version <version-alpha></span></a>
65
-	    <div class="sig">
66
-	      <a href="../dist/tor-<version-alpha>.tar.gz.asc">signature</a> &#x2012; <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
67
-	    </div>
68
-	  </div>
69
-
70
-	  <h2>Source Tarball</h2>
71
-	  <p>Configure with:<br/>
72
-            <code style="color: #666666;">./configure &amp;&amp; make &amp;&amp; src/or/tor</code> (or src/app/tor starting in 0.3.5.x)
73
-          </p>
74
-	  <p>The current stable version of Tor is <version-stable>. Its <a href="<gitblob>ReleaseNotes<cgitstable>">release notes</a> are available.</p>
75
-	  <p>The current unstable/alpha version of Tor is <version-alpha>. Its <a href="<gitblob>ChangeLog">Changelog</a> is available.</p>
76
-
77
-	</div>
78
-   </div>
79
-</div>
80
-<!-- END DOWNLOADS -->
81
-<!-- START DONATION WIDGET -->
82
-<a href="<page donate/donate-download>"><img src="../images/btn_donateCC_LG.gif"></a>
83
-<!-- END DONATION WIDGET -->
84
-<!-- START SIDECOL -->
85
-<div id="sidecol-right">
86
-<div class="img-shadow">
87
-<div class="sidenav-sub">
88
-<h2>What is Tor?</h2>
89
-<ul>
90
-<li class="dropdown"><a href="<page about/overview>">Take the tour</a></li>
91
-</ul>
92
-</div>
93
-</div>
94
-<div class="img-shadow">
95
-<div class="sidenav-sub">
96
-<h2><a href="<page download/download>">Other Downloads</a></h2>
97
-<ul>
98
-<li class="dropdown"><a href="<page download/download-unix>">Tor packages</a></li>
99
-<li class="dropdown"><a href="<page download/download-easy>">Tor Browser</a></li>
100
-<li class="dropdown"><a href="<page projects/projects>">All projects</a></li>
101
-</ul>
102
-</div>
103
-</div>
104
-<!-- START INFO -->
105
-<div class="img-shadow">
106
-<div class="sidenav-sub">
107
-<h2>Having Trouble?</h2>
108
-<ul>
109
-<li class="dropdown"><a href="<page docs/documentation>">Read the fine manuals</a></li>
110
-</ul>
111
-</div>
112
-</div>
113
-<!-- END INFO -->
114
-</div>
115
-<!-- END SIDECOL -->
116
-<div id="maincol-left">
117
-<!-- BEGIN WARNING -->
118
-<div class="warning">
119
-<a name="Warning"></a>
120
-<h2><a class="anchor" href="#warning">Want Tor to really work?</a></h2>
121
-	<p>You need to change some of your habits, as some things won't work exactly as
122
-you are used to.</p>
123
-
124
-<ol>
125
-<li><b>Use Tor Browser</b>
126
-
127
-<p>
128
-
129
-Tor does not protect all of your computer's Internet traffic when you
130
-run it. Tor only protects your applications that are properly configured to
131
-send their Internet traffic through Tor. To avoid problems with Tor
132
-configuration, we strongly recommend you use the
133
-<a href="<page projects/torbrowser>">Tor Browser</a>. It is pre-configured to protect
134
-your privacy and anonymity on the web as long as you're browsing with Tor
135
-Browser itself. Almost any other web browser configuration is likely to be
136
-unsafe to use with Tor.
137
-
138
-</p>
139
-
140
-</li>
141
-
142
-<li><b>Don't torrent over Tor</b>
143
-<p>
144
-Torrent file-sharing applications have been observed to ignore proxy 
145
-settings and make direct connections even when they are told to use Tor. 
146
-Even if your torrent application connects only through Tor, you will 
147
-often send out your real IP address in the tracker GET request, 
148
-because that's how torrents work. Not only do you <a 
149
-href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">
150
-deanonymize your torrent traffic and your other simultaneous Tor web 
151
-traffic</a> this way, you also slow down the entire Tor network for everyone else. 
152
-</p>
153
-</li>
154
-
155
-<li><b>Don't enable or install browser plugins</b>
156
-
157
-<p>
158
-
159
-Tor Browser will block browser plugins such as Flash, RealPlayer,
160
-Quicktime, and others: they can be manipulated into revealing your IP address.
161
-Similarly, we do not recommend installing additional addons or plugins into
162
-Tor Browser, as these may bypass Tor or otherwise harm your anonymity and
163
-privacy.
164
-
165
-</p>
166
-
167
-</li>
168
-
169
-<li><b>Use HTTPS versions of websites</b>
170
-
171
-<p>
172
-
173
-Tor will encrypt your traffic
174
-<a href="<page about/overview>#thesolution">to and
175
-within the Tor network</a>, but the encryption of your traffic to the final
176
-destination website depends upon on that website. To help ensure private
177
-encryption to websites, Tor Browser includes <a
178
-href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> to force the
179
-use of HTTPS encryption with major websites that support it. However, you
180
-should still watch the browser URL bar to ensure that websites you provide
181
-sensitive information to display a
182
-<a href="https://support.mozilla.com/en-US/kb/Site%20Identity%20Button">blue or
183
-green URL bar button</a>, include <b>https://</b> in the URL, and display the
184
-proper expected name for the website. Also see EFF's interactive page
185
-explaining <a href="https://www.eff.org/pages/tor-and-https">how Tor
186
-and HTTPS relate</a>.
187
-
188
-</p>
189
-
190
-</li>
191
-
192
-<li><b>Don't open documents downloaded through Tor while online</b>
193
-
194
-<p>
195
-
196
-Tor Browser will warn you before automatically opening documents that are
197
-handled by external applications. <b>DO NOT IGNORE THIS WARNING</b>.  You
198
-should be very careful when downloading documents via Tor (especially DOC and
199
-PDF files, unless you use the PDF viewer that's built into Tor Browser) as
200
-these documents can contain Internet resources that will be downloaded outside
201
-of Tor by the application that opens them. This will reveal your non-Tor IP
202
-address. If you must work with DOC and/or PDF files, we strongly recommend
203
-either using a disconnected computer,
204
-downloading the free <a href="https://www.virtualbox.org/">VirtualBox</a> and
205
-using it with a <a href="http://virtualboxes.org/">virtual machine image</a>
206
-with networking disabled, or using <a href="https://tails.boum.org/">Tails</a>.
207
-Under no circumstances is it safe to use
208
-<a href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">BitTorrent
209
-and Tor</a> together, however.
210
-
211
-</p>
212
-
213
-</li>
214
-
215
-<li><b>Use bridges and/or find company</b>
216
-
217
-<p>
218
-
219
-Tor tries to prevent attackers from learning what destination websites you
220
-connect to. However, by default, it does not prevent somebody watching your Internet
221
-traffic from learning that you're using Tor. If this matters to you, you can
222
-reduce this risk by configuring Tor to use a <a href="<page docs/bridges>">Tor
223
-bridge relay</a> rather than connecting directly to the public Tor network.
224
-Ultimately the best protection is a social approach: the more Tor
225
-users there are near you and the more
226
-<a href="<page about/torusers>">diverse</a> their interests, the less
227
-dangerous it will be that you are one of them. Convince other people to use
228
-Tor, too!
229
-
230
-</p>
231
-
232
-</li>
233
-
234
-</ol>
235
-<br>
236
-<p>
237
-Be smart and learn more. Understand what Tor does and does not offer.
238
-This list of pitfalls isn't complete, and we need your
239
-help <a href="<page getinvolved/volunteer>#Documentation">identifying and documenting
240
-all the issues</a>.
241
-</p>
242
-</div>
243
-<!-- END WARNING -->
244
-</div>
245
-<!-- END MAINCOL -->
246
-</div>
247
-<!-- END CONTENT -->
248
-
249
-#include <foot.wmi>
... ...
@@ -18,7 +18,7 @@
18 18
           <p class="desc">Protect your privacy. Defend yourself against network surveillance and traffic analysis.</p>
19 19
 
20 20
       <div id="download">
21
-        <a href="<page download/tor>">
21
+        <a href="<page download/download>">
22 22
           <span class="download-tor">Download Tor</span></a>
23 23
       </div>
24 24
       </div>
... ...
@@ -1,7 +1,8 @@
1 1
 #!wml
2 2
 
3 3
 <define-tag gitblob whitespace=delete>https://gitweb.torproject.org/tor.git/plain/</define-tag>
4
-<define-tag cgitstable whitespace=delete>?id=tor-<version-stable></define-tag> 
4
+<define-tag cgitstable whitespace=delete>?id=tor-<version-stable></define-tag>
5
+<define-tag cgitoldstable whitespace=delete>?id=tor-<version-oldstable></define-tag>
5 6
 <define-tag gittree whitespace=delete>https://gitweb.torproject.org/tor.git?a=tree;hb=HEAD;f=</define-tag>
6 7
 <define-tag gitrepo whitespace=delete>https://gitweb.torproject.org/tor.git?a=tree;hb=HEAD</define-tag>
7 8
 <define-tag svnwebsite whitespace=delete>https://svn.torproject.org/svn/website/trunk/</define-tag>
... ...
@@ -4,7 +4,7 @@
4 4
 
5 5
 #<!-- included by the download pages -->
6 6
 
7
-<div class="warning">
7
+<div class="note">
8 8
 <a name="warning"></a>
9 9
 <a name="Warning"></a>
10 10
 <h2><a class="anchor" href="#warning">Want Tor to really work?</a></h2>