Skip to content
Snippets Groups Projects
Commit c257c6cc authored by Hiro's avatar Hiro :surfer:
Browse files

Fix merge conflicts in sidenav

parents 8358537e c30e7120
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
about/en/contact.wml
+ 15
− 6
View file @ c257c6cc
......@@ -101,12 +101,21 @@
<a id="security"></a>
<h3><a class="anchor" href="#security">Security Issues</a></h3>
<p>If you've found a security issue in one of our projects or our
infrastructure, please email the respective maintainer. You can find
their GPG fingerprint/key on our <a
href="https://db.torproject.org">developer ldap search page</a>. Due
to the many different projects we have, we do not offer a single
list for security issues.</p>
<p>If you've found a security issue in one of our projects or in our
infrastructure, please email tor-security@lists.torproject.org.
You can get the GPG public key for the list by contacting
tor-security-sendkey@lists.torproject.org or from
pool.sks-keyservers.net. Here is the fingerprint:
<blockquote><pre>
gpg --fingerprint tor-security@lists.torproject.org
pub 4096R/1A7BF184 2017-03-13
Key fingerprint = 8B90 4624 C5A2 8654 E453 9BC2 E135 A8B4 1A7B F184
uid tor-security@lists.torproject.org <tor-security@lists.torproject.org>
uid tor-security@lists.torproject.org <tor-security-owner@lists.torproject.org>
uid tor-security@lists.torproject.org <tor-security-request@lists.torproject.org>
sub 4096R/C00942E4 2017-03-13
</pre></blockquote>
</p>
<a id="badrelays"></a>
<h3><a class="anchor" href="#badrelays">Report Bad Relays</a></h3>
......
docs/en/openbsd.wml deleted 100644 → 0
+ 0
− 39
View file @ 8358537e
## translation metadata
# Revision: $Revision$
# Translation-Priority: 2-medium
#include "head.wmi" TITLE="Tor Project: OpenBSD Install Instructions" CHARSET="UTF-8"
<div id="content" class="clearfix">
<div id="breadcrumbs">
<a href="<page index>">Home &raquo; </a>
<a href="<page docs/documentation>">Documentation &raquo; </a>
<a href="<page docs/tor-doc-osx>">OpenBSD Client</a>
</div>
<div id="maincol">
<h1>Running Tor on OpenBSD</h1>
<br>
<h2>These are advanced installation instructions for running
Tor in a OpenBSD environment.
</h2>
<p>To install from OpenBSD's packages, run:</p>
<pre>pkg_add tor-browser</pre>
<p>To install the Tor Browser port from an updated ports tree, run:</p>
<pre>cd /usr/ports/meta/tor-browser && make install</pre>
</div>
<!-- END MAINCOL -->
<div id = "sidecol">
#include "side.wmi"
#include "info.wmi"
</div>
<!-- END SIDECOL -->
</div>
<!-- END CONTENT -->
#include <foot.wmi>
docs/en/sidenav.wmi
+ 3
− 3
View file @ c257c6cc
......@@ -39,9 +39,9 @@
{'url' => 'docs/debian',
'txt' => 'Installing Tor on Debian/Ubuntu',
},
{'url' => 'docs/openbsd',
'txt' => 'Installing Tor on OpenBSD',
},
{'url' => 'docs/rpms',
'txt' => 'Installing Tor on Fedora/CentOS',
},
{'url' => 'docs/tor-doc-unix',
'txt' => 'Installing Tor Source',
},
......
download/en/download-easy.wml
+ 20
− 0
View file @ c257c6cc
......@@ -119,6 +119,25 @@
<p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
</div>
</div>
<!-- START BSD -->
<div id="openbsd" class="easy bsd">
<div class="package" style="padding-top: 13px; border-top: 0px;">
<div class="desc">
<h2>Running Tor on OpenBSD</h2>
<p>These are installation instructions for running Tor Browser in a OpenBSD environment.</p>
<p>To install from OpenBSD's packages, run:</p>
<pre>pkg_add tor-browser</pre>
<p>To install the Tor Browser port from an updated ports tree, run:</p>
<pre>cd /usr/ports/meta/tor-browser && make install</pre>
</div>
</div>
</div>
<!-- START Orbot -->
<div id="android" class="easy android">
<div class="package" style="padding-top: 13px; border-top: 0px;">
......@@ -268,6 +287,7 @@ are blocked.</p>
<li class="dropdown"><a href="#windows">Microsoft Windows</a></li>
<li class="dropdown"><a href="#mac">Apple OS X</a></li>
<li class="dropdown"><a href="#linux">Linux</a></li>
<li class="dropdown"><a href="#openbsd">OpenBSD</a></li>
<li class="dropdown"><a href="#android">Android</a></li>
<li class="dropdown"><a href="<page download/download>">All Downloads</a></li>
</ul>
......
js/dlpage01.js
+ 5
− 3
View file @ c257c6cc
......@@ -16,7 +16,7 @@ function OScheck() {
}else if(clientos == "Windows"){
$('.easy.windows').css('display', 'block');
}else if(clientos == "Mac"){
$('.easy.mac').css('display', 'block');
$('.easy.mac').css('display', 'block');
}else if(clientos == "Android"){
$('.easy.android').css('display', 'block');
}else{
......@@ -92,7 +92,7 @@ $(document).ready(function () {
var url = $.param.fragment();
// Toggle the '.easy' divs to off
if(url == 'windows'|url == 'mac'|url == 'linux'|url == 'android'){
if(url == 'windows'|url == 'mac'|url == 'linux'|url == 'openbsd'|url == 'android'){
$('.easy').css('display', 'none');
}
......@@ -102,7 +102,9 @@ $(document).ready(function () {
} else if(url == 'mac'){
$('.easy.mac').css('display', 'block');
} else if(url == 'linux'){
$('.easy.linux').css('display', 'block');
$('.easy.linux').css('display', 'block');
} else if(url == 'openbsd'){
$('.easy.bsd').css('display', 'block');
} else if(url == 'android'){
$('.easy.android').css('display', 'block');
} else {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment