Browse code

verification: split by OS (#17413)

traumschule authored on 28/08/2018 13:07:15
Showing 3 changed files
... ...
@@ -1364,22 +1364,18 @@ p.blogDate {
1364 1364
     height 0.3s ease-in-out,
1365 1365
     box-shadow 0.6s linear;
1366 1366
 }
1367
-.accordion .ac-box input:active ~ label p a,
1367
+
1368 1368
 .accordion .ac-box input:checked ~ label p a {
1369 1369
   font-weight: bold;
1370 1370
   color: red;
1371 1371
   text-decoration: underline;
1372 1372
 }
1373
-.accordion div:hover ~ article,
1374
-.accordion div:active ~ article,
1375 1373
 .accordion input:checked ~ article {
1376 1374
   height: 100%;
1377 1375
   transition:
1378 1376
     height 0.5s ease-in-out,
1379 1377
     box-shadow 0.1s linear;
1380 1378
 }
1381
-
1382
-.accordion input:active ~ article.ac-box
1383 1379
 .accordion input:checked ~ article.ac-box {
1384 1380
   -background: grey;
1385 1381
   border: solid 1px #66a516;
... ...
@@ -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}#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;padding-left:10px}.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}.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}
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}#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;padding-left:10px}.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}.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:checked ~ label p a{font-weight:bold;color:red;text-decoration:underline}.accordion input:checked ~ article{height:100%;transition:height .5s ease-in-out,box-shadow .1s linear}.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}
3 3
\ No newline at end of file
... ...
@@ -18,7 +18,7 @@
18 18
  <div>
19 19
    <input id="ac-0" name="accordion-0" type="checkbox" checked />
20 20
    <label for="ac-0">
21
-    <h1><a name="TOC">How to verify signatures for packages</a></h1>
21
+    <h1><a name="TOC">How to verify signatures of packages</a></h1>
22 22
     <hr>
23 23
    </label>
24 24
    <article class="ac-small">
... ...
@@ -27,11 +27,11 @@
27 27
     <div class="sidenav-sub">
28 28
     <ul>
29 29
       <li><a href="#Why-verify-signature">Always verify downloads</a></li>
30
-      <li><a href="#Keys">Trust in keys</a></li>
31
-      <li><a href="#Windows">Windows</a></li>
32
-      <li><a href="#MacosLinux">Mac OS X and Linux</a></li>
33
-      <li><a href="#BuildVerification">Verify files</a></li>
34
-      <li><a href="#MARVerification">MAR files</a></li>
30
+      <li><a href="#ImportKey">Import Tor's signing key</a></li>
31
+      <li><a href="#VerifySignature">Verify OpenPGP signatures</a></li>
32
+      <li><a href="#ChecksumVerification">Verify checksums</a></li>
33
+      <li><a href="#MARVerification">MAR verification</a></li>
34
+      <li><a href="#Troubleshooting">Troubleshooting</a></li>
35 35
       <li><a href="#Scripts">Scripts</a></li>
36 36
     </ul>
37 37
     </div>
... ...
@@ -69,7 +69,6 @@
69 69
    </label>
70 70
    <article class="ac-small">
71 71
 
72
-
73 72
     <p>
74 73
     For many Tor users it is important to verify that the Tor software is
75 74
     authentic as they have very real adversaries who might try to give them a
... ...
@@ -134,13 +133,12 @@
134 133
   </article>
135 134
  </div>
136 135
 
137
-<!-- Location of keys -->
136
+<!-- Import Tor's signing key -->
138 137
  <div>
139 138
   <input id="ac-2" name="accordion-2" type="checkbox" checked />
140 139
   <label for="ac-2">
141
-    <a class="nav" title="link here" href="#Keys">&#9668;</a>
142
-    <h3><a name="Keys">Where do I get the signatures and the keys that made
143
-        them?</a></h3>
140
+    <a class="nav" title="link here" href="#ImportKey">&#9668;</a>
141
+    <h3><a name="ImportKey">Step 1: Import Tor's signing key</a></h3>
144 142
     <hr>
145 143
     <p>
146 144
     Each file on <a href="<page download/download>">our download
... ...
@@ -154,44 +152,18 @@
154 152
     <a href="<page docs/signing-keys>">signing keys</a> page.
155 153
     </p>
156 154
   </label>
157
-  <article class="ac-medium">
158
-    <p>
159
-    In the following section We now show how you can verify the downloaded file's digital signature on
160
-    different operating systems. Please notice that a signature is dated the
161
-    moment the package has been signed. Therefore every time a new file is
162
-    uploaded a new signature is generated with a different date. As long as you
163
-    have verified the signature you should not worry that the reported date may
164
-    vary.
165
-    </p>
166
-    <a class="nav" href="#TOC" title="go up">&uarr;</a>
167
-  </article>
168
- </div>
169
-
170
-  <input id="ac-3" name="accordion-3" type="checkbox" checked />
171
-  <label for="ac-3">
172
-    <a class="nav" title="link here" href="#Keys">&#9668;</a>
173
-    <h3><a name="Keys">How to verify files with OpenPGP signatures</a></h3>
174
-    <hr>
175
-    <p>
176
-    In the following section We now show how you can verify the downloaded file's digital signature on
177
-    different operating systems. Please notice that a signature is dated the
178
-    moment the package has been signed. Therefore every time a new file is
179
-    uploaded a new signature is generated with a different date. As long as you
180
-    have verified the signature you should not worry that the reported date may
181
-    vary.
182
-    </p>
183
-  </label>
184
-  <article class="ac-medium">
155
+  <article class="ac-box">
185 156
 
157
+   <p><span class="hint">Choose your operating system:</span>
158
+   <label for="ac-2-1"><a name="KeyWindows">&#9658; Windows</a></label>
159
+   <label for="ac-2-2"><a name="KeyMacOS">&#9658; Mac OS X</a></label>
160
+   <label for="ac-2-3"><a name="KeyLinux">&#9658; Linux</a></label>
161
+   </p>
186 162
 <!-- Windows -->
187
- <div>
188
-  <input id="ac-3-1" name="accordion-3-1" type="checkbox" />
189
-   <label for="ac-3-1">
190
-    <a class="nav" title="link here" href="#Windows">&#9668;</a>
191
-    <h4><a name="Windows">Windows</a></h4>
192
-    <hr>
193
-   </label>
194
-   <article class="ac-small">
163
+  <div>
164
+   <input id="ac-2-1" name="accordion-2" type="radio" checked />
165
+   <article class="ac-os">
166
+    <h3>Import OpenPGP keys on Windows</h3>
195 167
     <p>
196 168
     First of all you need to have GnuPG installed before you can verify
197 169
     signatures.
... ...
@@ -210,10 +182,52 @@
210 182
     </p>
211 183
     <pre>gpg.exe --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290</pre>
212 184
     <p>
185
+   </article>
186
+  </div>
187
+<!-- MacOS -->
188
+  <div>
189
+   <input id="ac-2-2" name="accordion-2" type="radio" />
190
+   <article class="ac-os">
191
+    <h3>Import OpenPGP keys on Mac OS</h3>
192
+    <p>
193
+    You need to have GnuPG installed before you can verify
194
+    signatures. Install it from
195
+    <a href="https://www.gpgtools.org/">https://www.gpgtools.org/</a>.
196
+    </p>
197
+
198
+    <p>The next step is to use GnuPG to import the key that signed
199
+    your package. The Tor Browser team signs Tor Browser releases. Import its
200
+    key (0x4E2C6E8793298290) by starting the terminal under "Applications"
201
+    and typing:</p>
202
+    <pre>gpg --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290</pre>
203
+    <p>
204
+   </article>
205
+  </div>
206
+<!-- Linux -->
207
+  <div>
208
+   <input id="ac-2-3" name="accordion-2" type="radio" />
209
+   <article class="ac-os">
210
+    <h3>Import OpenPGP keys on Linux</h3>
211
+    <p>
212
+    You need to have GnuPG installed before you can verify
213
+    signatures. It's probably GnuPG is alreadyy installed on your
214
+    system, as most Linux distributions come with it preinstalled.
215
+    </p>
216
+
217
+    <p>
218
+    The next step is to use GnuPG to import the key that signed
219
+    your package. The Tor Browser team signs Tor Browser releases. Import its
220
+    key (0x4E2C6E8793298290) by starting the terminal and typing:</p>
221
+    <pre>gpg --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290</pre>
222
+    <p>
223
+   </article>
224
+  </div>
225
+  <div>
226
+    <p>
213 227
     After importing the key, you can verify that the fingerprint
214 228
     is correct:
215 229
     </p>
216
-    <pre>gpg.exe --fingerprint 0x4E2C6E8793298290</pre>
230
+    <pre>gpg --fingerprint 0x4E2C6E8793298290</pre>
217 231
     <p>You should see:</p>
218 232
     <pre>
219 233
 pub   rsa4096/0x4E2C6E8793298290 2014-12-15 [C] [expires: 2020-08-24]
... ...
@@ -224,6 +238,41 @@ sub   rsa4096/0xD1483FA6C3C07136 2016-08-24 [S] [expires: 2018-08-24]
224 238
 sub   rsa4096/0xEB774491D9FF06E2 2018-05-26 [S] [expires: 2020-09-12]
225 239
       Key fingerprint = 1107 75B5 D101 FB36 BC6C  911B EB77 4491 D9FF 06E2
226 240
     </pre>
241
+    <a class="nav" href="#TOC" title="go up">&uarr;</a>
242
+  </div>
243
+ </article><!-- END Import -->
244
+</div>
245
+
246
+<!-- Verifiy with OpenPGP signature -->
247
+<div>
248
+ <input id="ac-3" name="accordion-3" type="checkbox" />
249
+ <label for="ac-3">
250
+    <a class="nav" title="link here" href="#VerifySignature">&#9668;</a>
251
+    <h3><a name="VerifySignature">Step 2: Verification with OpenGPG signatures</a></h3>
252
+    <hr>
253
+    <p>This section explains how to verify the downloaded file's digital
254
+    signature on different operating systems. Please notice that a signature is
255
+    dated the moment the package has been signed. Therefore every time a new
256
+    file is uploaded a new signature is generated with a different date. As
257
+    long as you have verified the signature you should not worry that the
258
+    reported date may vary.
259
+    </p>
260
+  </label>
261
+  <article class="ac-box">
262
+   <p><span class="hint">Choose your operating system:</span>
263
+   <label for="ac-3-1"><a name="VerifyWindows">&#9658; Windows</a></label>
264
+   <label for="ac-3-2"><a name="VerifyMacOS">&#9658; Mac OS X</a></label>
265
+   <label for="ac-3-3"><a name="VerifyLinux">&#9658; Linux</a></label>
266
+   </p>
267
+   <p>
268
+   If you haven't already, <a href="<page download/download>">download</a>
269
+   the files you are interested in.
270
+   </p>
271
+<!-- Windows -->
272
+  <div>
273
+   <input id="ac-3-1" name="accordion-3" type="radio" checked />
274
+   <article class="ac-os">
275
+    <h3>Verify with an OpenPGP signature on Windows</h3>
227 276
     <p>
228 277
     To verify the signature of the package you downloaded, you will need
229 278
     to download the ".asc" file as well. Assuming you downloaded the
... ...
@@ -242,69 +291,47 @@ gpg:          There is no indication that the signature belongs to the owner.
242 291
 Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
243 292
      Subkey fingerprint: A430 0A6B C93C 0877 A445  1486 D148 3FA6 C3C0 7136
244 293
     </pre>
245
-    <p>Currently valid subkey fingerprints are:</p>
246
-    <pre>
247
-    5242 013F 02AF C851 B1C7  36B8 7017 ADCE F65C 2036
248
-    BA1E E421 BBB4 5263 180E  1FC7 2E1A C68E D408 14E0
249
-    A430 0A6B C93C 0877 A445  1486 D148 3FA6 C3C0 7136
250
-    </pre>
294
+   </article>
295
+  </div>
296
+<!-- MacOS -->
297
+  <div>
298
+   <input id="ac-3-2" name="accordion-3" type="radio" />
299
+   <article class="ac-os">
300
+    <h3>Verify with an OpenPGP signature on Mac OS</h3>
251 301
     <p>
252
-    Notice that there is a warning because you haven't assigned a trust
253
-    index to this person. This means that GnuPG verified that the key made
254
-    that signature, but it's up to you to decide if that key really belongs
255
-    to the developer. The best method is to meet the developer in person and
256
-    exchange key fingerprints.
302
+    To verify the signature of the package you downloaded, you will need
303
+    to download the ".asc" file as well. Assuming you downloaded the
304
+    package and its signature to your Downloads folder, run:
257 305
     </p>
258
-    <a class="nav" href="#TOC" title="go up">&uarr;</a>
259
-  </article>
260
- </div>
261 306
 
262
-<!-- MacOS / Linux -->
263
- <div>
264
-  <input id="ac-4-1" name="accordion-4-1" type="checkbox" />
265
-   <label for="ac-4-1">
266
-    <a class="nav" title="link here" href="#MacosLinux">&#9668;</a>
267
-    <h4><a name="MacosLinux">Mac OS X and Linux</a></h4>
268
-    <hr>
269
-   </label>
270
-   <article class="ac-small">
271
-    <p>You need to have GnuPG installed before you can verify
272
-    signatures. If you are using Mac OS X, you can install it from <a
273
-    href="https://www.gpgtools.org/">https://www.gpgtools.org/</a>. If you
274
-    are using Linux, then it's probably you already have GnuPG in your
275
-    system, as most Linux distributions come with it preinstalled.
276
-    </p>
307
+    <pre>gpg --verify ~/Downloads/TorBrowser-<version-torbrowserbundleosx64>_en-US.dmg{.asc*,}</pre>
308
+
309
+    <p>The output should say "Good signature":</p>
277 310
 
278
-    <p>The next step is to use GnuPG to import the key that signed
279
-    your package. The Tor Browser team signs Tor Browser releases. Import its
280
-    key (0x4E2C6E8793298290) by starting the terminal (under "Applications"
281
-    in Mac OS X) and typing:</p>
282
-    <pre>gpg --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290</pre>
283
-    <p>
284
-    After importing the key, you can verify that the fingerprint
285
-    is correct:
286
-    </p>
287
-    <pre>gpg --fingerprint 0x4E2C6E8793298290</pre>
288
-    <p>You should see:</p>
289 311
     <pre>
290
-pub   rsa4096/0x4E2C6E8793298290 2014-12-15 [C] [expires: 2020-08-24]
291
-      Key fingerprint = EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
292
-uid                   [ unknown] Tor Browser Developers (signing key) &lt;torbrowser@torproject.org&gt;
293
-sub   rsa4096/0xD1483FA6C3C07136 2016-08-24 [S] [expires: 2018-08-24]
294
-      Key fingerprint = A430 0A6B C93C 0877 A445  1486 D148 3FA6 C3C0 7136
295
-sub   rsa4096/0xEB774491D9FF06E2 2018-05-26 [S] [expires: 2020-09-12]
296
-      Key fingerprint = 1107 75B5 D101 FB36 BC6C  911B EB77 4491 D9FF 06E2
312
+gpg: assuming signed data in 'tor-browser-osx64-<version-torbrowserbundleosx64>_en-US.tar.xz'
313
+gpg: Signature made Wed 15 Nov 2017 05:52:38 PM CET
314
+gpg:                using RSA key 0xD1483FA6C3C07136
315
+gpg: Good signature from "Tor Browser Developers (signing key) &lt;torbrowser@torproject.org&gt;" [unknown]
316
+gpg: WARNING: This key is not certified with a trusted signature!
317
+gpg:          There is no indication that the signature belongs to the owner.
318
+Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
319
+     Subkey fingerprint: A430 0A6B C93C 0877 A445  1486 D148 3FA6 C3C0 7136
297 320
     </pre>
321
+   </article>
322
+  </div>
323
+<!-- Linux -->
324
+  <div>
325
+   <input id="ac-3-3" name="accordion-3" type="radio" />
326
+   <article class="ac-os">
327
+    <h3>Verify with an OpenPGP signature on Linux</h3>
298 328
     <p>
299 329
     To verify the signature of the package you downloaded, you will need
300 330
     to download the ".asc" file as well. Assuming you downloaded the
301 331
     package and its signature to your Downloads folder, run:
302 332
     </p>
303 333
 
304
-    <p><strong>For Mac OS X users</strong>:<br /></p>
305
-    <pre>gpg --verify ~/Downloads/TorBrowser-<version-torbrowserbundleosx64>-osx64_en-US.dmg{.asc*,}</pre>
306
-
307
-    <p><strong>For Linux users</strong> (change 64 to 32 if you have the 32-bit package):</p>
334
+    <p>Change 64 to 32 if you have the 32-bit package:</p>
308 335
 
309 336
     <pre>gpg --verify tor-browser-linux64-<version-torbrowserbundlelinux64>_en-US.tar.xz.asc</pre>
310 337
 
... ...
@@ -320,6 +347,19 @@ gpg:          There is no indication that the signature belongs to the owner.
320 347
 Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
321 348
      Subkey fingerprint: A430 0A6B C93C 0877 A445  1486 D148 3FA6 C3C0 7136
322 349
     </pre>
350
+
351
+    <p>
352
+    On <b>Debian</b> for Tor (not Tor Browser) packages, you should read the
353
+    instructions on
354
+    <a href="<page docs/debian>#packages">importing these keys to apt</a>.
355
+    If you're using the <b>RPMs</b> (for Tor, not Tor Browser), you can
356
+    manually verify the signatures on the RPM packages by
357
+    <pre>rpm -K filename.rpm</pre>
358
+    </p>
359
+
360
+  </article>
361
+ </div>
362
+<!-- END OS specific sections -->
323 363
     <p>
324 364
     Currently valid subkey fingerprints are:
325 365
     </p>
... ...
@@ -336,132 +376,186 @@ Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
336 376
     exchange key fingerprints.
337 377
     </p>
338 378
 
339
-    <p>
340
-    If you're a Linux user and you're using the <b>Debian</b> Tor (not Tor
341
-    Browser) packages, you should read the instructions on <a
342
-    href="<page docs/debian>#packages">importing these keys to apt</a>.
343
-    If you're using the <b>RPMs</b> (for Tor, not Tor Browser), you can
344
-    manually verify the signatures on the RPM packages by
345
-    <pre>rpm -K filename.rpm</pre>
379
+    <p>To learn more about GnuPG see
380
+    <a href="https://www.gnupg.org/documentation/">https://www.gnupg.org/documentation/</a>
346 381
     </p>
347 382
 
348
-    <p>See <a
349
-    href="https://www.gnupg.org/documentation/">https://www.gnupg.org/documentation/</a>
350
-    to learn more about GnuPG.</p>
351 383
     <a class="nav" href="#TOC" title="go up">&uarr;</a>
352 384
   </article>
353 385
  </div>
354 386
 
355
-    <a class="nav" href="#TOC" title="go up">&uarr;</a>
356
-  </article>
357
- </div>
358
-
359
-<!-- Build verification -->
387
+<!-- Verify checksums -->
360 388
  <div>
361
-  <input id="ac-5" name="accordion-5" type="checkbox" />
362
-   <label for="ac-5">
363
-    <a class="nav" title="link here" href="#BuildVerification">&#9668;</a>
364
-    <h3><a id="BuildVerification">Verifying sha256sums (advanced)</a></h3>
389
+  <input id="ac-4" name="accordion-4" type="checkbox" />
390
+   <label for="ac-4">
391
+    <a class="nav" title="link here" href="#ChecksumVerification">&#9668;</a>
392
+    <h3><a id="Checksumerification">Step 3: Verify the file integrity</a></h3>
365 393
     <hr>
394
+    <p>
395
+    Build reproducibility is a
396
+    <a href="https://blog.torproject.org/blog/deterministic-builds-part-one-cyberwar-and-global-compromise">
397
+    security property</a> of Tor Browser 3.0 and later. Anyone can build
398
+    Tor Browser on their own machine and produce a binary that is bit-for-bit
399
+    identical to the binary we offer on the download page.
400
+    Fortunately, it is not necessary for everyone to build Tor Browser locally
401
+    to get this security. Verifying and comparing the signed list of
402
+    <a href="https://en.wikipedia.org/wiki/Cryptographic_hash">hashes</a>
403
+    will confirm that multiple people have built Tor Browsers identical to the
404
+    download.
405
+    </p>
366 406
    </label>
367
-   <article class="ac-small">
368
-    <p>Build reproducibility is a <a
369
-       href="https://blog.torproject.org/blog/deterministic-builds-part-one-cyberwar-and-global-compromise">security
370
-       property</a> of Tor Browser 3.0 and later. Anyone can build
371
-       Tor Browser on their own machine and produce a binary that is
372
-       bit-for-bit identical to the binary we offer on the download page.
373
-       Fortunately, it is not necessary for everyone to build Tor Browser
374
-       locally to get this security. Verifying and comparing the signed list
375
-       of <a href="https://en.wikipedia.org/wiki/Cryptographic_hash">hashes</a>
376
-       will confirm that multiple people have built Tor Browsers
377
-       identical to the download.</p>
378
-
379
-      <p>The steps below walk through this process:</p>
380
-
381
-    <ul>
382
-      <li>Download the Tor Browser package, the <tt>sha256sums-unsigned-build.txt</tt>
383
-      file, and the <tt>sha256sums-unsigned-build.txt.asc</tt> signature file.
407
+  <article>
408
+    <p>
409
+    Note: This process does not work on OS X yet due to Apple's codesigning requirement.
410
+    See <a href="#MARVerification">MAR verification</a> below.
411
+    </p>
412
+     <ul>
413
+      <li>
414
+      <a href="<page download/download>">Download</a> the Tor Browser package,
415
+      the <tt>sha256sums-unsigned-build.txt</tt> file, and the
416
+      <tt>sha256sums-unsigned-build.txt.asc</tt> signature file.
384 417
       They can all be found in the same directory under
385 418
       <a href="https://www.torproject.org/dist/torbrowser/">
386 419
       https://www.torproject.org/dist/torbrowser/</a>, for example in '<version-torbrowserbundlelinux64>'
387
-      for Tor Browser <version-torbrowserbundlelinux64>.</li>
388
-
389
-      <li>In case your operating system is adding the .txt extension
390
-      automatically to the SHA256 sums signature file strip it again by running
391
-      <pre>mv sha256sums-unsigned-build.txt.asc.txt sha256sums-unsigned-build.txt.asc</pre>
392
-
393
-      <li>Retrieve the signers' GPG keys. This can be done from the command
394
-      line by entering something like
395
-      <pre>gpg --keyserver keys.mozilla.org --recv-keys 0x4E2C6E8793298290</pre>
396
-      (This will bring you the public part of the Tor Browser developers'
397
-       signing key. Other developers' key IDs can be found on
398
-      <a href="<page docs/signing-keys>">this
399
-      page</a>.)</li>
400
-
401
-      <li>
402
-      Verify the sha256sums-unsigned-build.txt file by executing this command:
403
-      <pre>
404
-      gpg --verify sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.txt
405
-      </pre>
420
+      for Tor Browser <version-torbrowserbundlelinux64>.
406 421
       </li>
407
-
408 422
       <li>
409
-      You should see a message like "Good signature from &lt;DEVELOPER
410
-      NAME&gt;". If you don't, there is a problem. Try these steps again.
411
-      </li>
423
+      Retrieve the signers' GPG keys with this id like described above<br/>
424
+      (Other developers' key IDs can be found on
425
+      <a href="<page docs/signing-keys>">this page)</a>:    
426
+      <pre id="ttb-key">0x4E2C6E8793298290</pre></li>
427
+     </ul>
428
+  </article>
429
+  <article class="ac-box">
430
+  
431
+   <p><span class="hint">Choose your operating system:</span>
432
+   <span>
433
+
434
+    <label for="ac-4-1"><a name="ChecksumsWindows">&#9658; Windows</a></label>
435
+   </span>
436
+   <!--<span>
437
+   <input id="ac-4-2" name="accordion-4" type="radio" />
438
+   <label for="ac-4-2"><a name="ChecksumMacOS">MacOS</a></label>
439
+   </span>-->
440
+   <span>
441
+    <label for="ac-4-3"><a name="ChecksumsLinux">&#9658; Linux</a></label>
442
+   </span>
443
+   </p>
444
+
445
+<!-- Windows -->
446
+  <div>
447
+    <input id="ac-4-1" name="accordion-4" type="radio" />
448
+   <article class="ac-os">
449
+    <h3>Verififcation with a checksum on Windows</h3>
450
+    <h4>Verify the signature of the checksum file</h4>
451
+    <p>
452
+    Verify the sha256sums-unsigned-build.txt file by executing this command:
453
+    </p>
454
+    <pre>gpg.exe --verify sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.txt
455
+    </pre>
456
+
457
+    <p>
458
+    You should see a message like
459
+    <pre>"Good signature from &lt;DEVELOPER NAME&gt;"</pre>.
460
+    If you don't, there is a problem. Try these steps again.
461
+    </p>
412 462
 
463
+    <h4>Verify the file integrity of Tor Browser</h4>
464
+     <ul>
413 465
       <li>If you want to verify a Windows Tor Browser package you need to first
414
-      strip off the authenticode signature of it. Tools that can be used for
415
-      this purpose are
466
+      strip off the authenticode signature of it.<br/>
467
+      Tools that can be used for this purpose are
416 468
       <a href="http://osslsigncode.sourceforge.net">osslsigncode</a> and
417 469
       <a href="http://forum.xda-developers.com/showthread.php?t=416175">delcert.exe</a>.
418 470
       Assuming you have built e.g. <tt>osslsigncode</tt> on a Linux computer you can enter
419
-      <pre>/path/to/your/osslsigncode remove-signature &#92;
420
-        /path/to/your/&lt;TOR BROWSER FILE NAME&gt;.exe &lt;TOR BROWSER FILE NAME&gt;.exe
471
+      </li>
472
+      <pre>C:\path\to\osslsigncode remove-signature &#92;
473
+      C:\path\to\your\&lt;TOR BROWSER FILE NAME&gt;.exe &lt;TOR BROWSER FILE NAME&gt;.exe
421 474
       </pre>
475
+
476
+      <li>Now use the sha256sum of the Tor Browser package with the
477
+      <a href="http://md5deep.sourceforge.net/">hashdeep utility</a> and run
422 478
       </li>
479
+      <pre>C:\location\where\you\saved\hashdeep -c sha256sum &lt;TOR BROWSER FILE NAME&gt;.exe</pre>
480
+     </ul>
481
+   </article>
482
+  </div>
483
+<!-- Mac OS --><!--
484
+ <div>
485
+   <article class="ac-os">
486
+     This process does not work on OS X yet due to Apple's codesigning requirement.
487
+   </article>
488
+ </div>
489
+-->
423 490
 
424
-      <li>Now you can take the sha256sum of the Tor Browser package. On
425
-      Windows you can use the <a href="http://md5deep.sourceforge.net/">
426
-      hashdeep utility</a> and run
427
-      <pre>
428
-      C:\location\where\you\saved\hashdeep -c sha256sum &lt;TOR BROWSER FILE NAME&gt;.exe
429
-      </pre>
430
-      <p>On Linux you can run</p>
431
-      <pre>sha256sum &lt;TOR BROWSER FILE NAME&gt;.tar.gz</pre>
432
-      without having to download a utility. Note: this does not work for OS X
433
-      yet due to Apple's codesigning requirement.</li>
491
+<!-- Linux -->
492
+    <input id="ac-4-3" name="accordion-4" type="radio" />
493
+   <article class="ac-os ac-4-3">
494
+    <h3>Verififcation with a checksum on Linux</h3>
495
+    <h4>Verify the signature of the checksum file</h4>
496
+    <ul>
497
+     <li>Verify the sha256sums-unsigned-build.txt with this command:</li>
498
+     <pre>gpg --verify sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.txt
499
+     </pre>
500
+
501
+     <li>><!-- TODO which OSs are meant here? -->
502
+     In case your operating system is adding the .txt extension automatically
503
+     to the SHA256 sums signature file strip it again by running
504
+     </li>>
505
+     <pre>mv sha256sums-unsigned-build.txt.asc.txt sha256sums-unsigned-build.txt.asc</pre>
506
+
507
+     <li>>
508
+     Verify the sha256sums-unsigned-build.txt file by executing this command:
509
+     </li>
510
+     <pre>gpg --verify sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.txt
511
+     </pre>
512
+
513
+     <li>
514
+     You should see a message like
515
+     <pre>"Good signature from &lt;DEVELOPER NAME&gt;"</pre>.
516
+     If you don't, there is a problem. Try these steps again.
517
+     </li>
518
+    </ul>
519
+
520
+    <h4>Verify the file integrity of Tor Browser</h4>
521
+    <ul>
522
+     <li>Calculate the SHA-256 checksum of Tor Browser:</li>
523
+     <pre>sha256sum &lt;TOR BROWSER FILE NAME&gt;.tar.gz</pre>
434 524
 
435
-      <li>You will see a string of letters and numbers.</li>
525
+     <li>You will see a string of letters and numbers.</li>
436 526
 
437
-      <li>Open <tt>sha256sums-unsigned-build.txt</tt> in a text editor.</li>
527
+     <li>Open <tt>sha256sums-unsigned-build.txt</tt> in a text editor.</li>
438 528
 
439
-      <li>Locate the name of the Tor Browser file you downloaded.</li>
529
+     <li>Locate the name of the Tor Browser file you downloaded.</li>
440 530
 
441
-      <li>Compare the string of letters and numbers to the left of your
442
-      filename with the string of letters and numbers that appeared
443
-      on your command line. If they match, you've successfully verified the
444
-      build.</li>
531
+     <li>
532
+     Compare the string of letters and numbers to the left of your filename with
533
+     the string of letters and numbers that appeared on your command line.
534
+     If they match, you've successfully verified the build.
535
+     </li>
445 536
     </ul>
446
-    <a class="nav" href="#TOC" title="go up">&uarr;</a>
537
+   </article>
538
+   <a class="nav" href="#TOC" title="go up">&uarr;</a>
447 539
   </article>
448 540
  </div>
449 541
 
450 542
 <!-- MAR verification -->
451 543
  <div>
452
-  <input id="ac-6" name="accordion-6" type="checkbox" />
453
-   <label for="ac-6">
544
+  <input id="ac-5" name="accordion-5" type="checkbox" />
545
+   <label for="ac-5">
454 546
     <a class="nav" title="link here" href="#MARVerification">&#9668;</a>
455
-    <h3><a id="MARVerification">Verifying MAR files we ship (advanced)</a></h3>
547
+    <h3><a name="MARVerification">MAR verification</a></h3>
456 548
     <hr>
457
-   </label>
458
-   <article class="ac-small">
459
-    <p>Starting with Tor Browser 4.5a4 we sign our MAR files which helps
549
+    <p>
550
+    Starting with Tor Browser 4.5a4 we sign our MAR files which helps
460 551
     securing our update process. The downside of this is the need for additional
461 552
     instructions to verify that the MAR files we ship are indeed the ones we
462
-    produced with our rbm setup.</p>
463
-
464
-    <p>Assuming the verification happens on a Linux computer one first needs the
553
+    produced with our rbm setup.
554
+    </p>
555
+   </label>
556
+   <article class="ac-small">
557
+    <p>
558
+    Assuming the verification happens on a Linux computer one first needs the
465 559
     <tt>mar-tools-linux*.zip</tt> out of the <tt>gitian-builder/inputs</tt>
466 560
     directory to remove the embedded signature(s). The steps to get the unsigned
467 561
     MAR file on a 64 bit Linux are</p>
... ...
@@ -473,7 +567,23 @@ Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
473 567
     <p>Now you can compare the SHA256 sum of <tt>your-unsigned-mar-file.mar</tt>
474 568
     with the one provided in the <tt>sha265sums-unsigned-build.txt</tt> or
475 569
     <tt>sha256sums-unsigned-build.incremental.txt</tt> as outlined in
476
-    <a href="#BuildVerification">Verifying sha256sums (advancded)</a> above.</p>
570
+    <a href="#ChekcksumVerification">Checksum verification</a> above.
571
+    </p>
572
+   </article>
573
+ </div>
574
+
575
+<!-- Troubleshooting -->
576
+ <div>
577
+  <input id="ac-6" name="accordion-6" type="checkbox" />
578
+   <label for="ac-6">
579
+    <a class="nav" title="link here" href="#Troubleshooting">&#9668;</a>
580
+    <h3><a id="Troubleshooting">Troubleshooting</a></h3>
581
+    <hr>
582
+    <p>Does this guide work for you? Is a question missing?
583
+    <a href="<page about/contact>#support">Reach out to us</a>!</p>
584
+   </label>
585
+   <article class="ac-small">
586
+   
477 587
     <a class="nav" href="#TOC" title="go up">&uarr;</a>
478 588
   </article>
479 589
  </div>
... ...
@@ -485,12 +595,12 @@ Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
485 595
     <a class="nav" title="link here" href="#Scripts">&#9668;</a>
486 596
     <h3><a id="Scripts">Automate the process with a script</a></h3>
487 597
     <hr>
488
-   </label>
489
-   <article class="ac-small">
490 598
     <p><a href="https://github.com/isislovecruft/scripts/blob/master/verify-gitian-builder-signatures">Scripts</a>
491 599
     to <a href="https://tor.stackexchange.com/questions/648/how-to-verify-tor-browser-bundle-tbb-3-x">automate</a>
492 600
     these steps have been written, but to use them you will need to modify
493 601
     them yourself with the latest Tor Browser filename.</p>
602
+   </label>
603
+   <article class="ac-small">
494 604
     <a class="nav" href="#TOC" title="go up">&uarr;</a>
495 605
   </article>
496 606
  </div>