March 2018 - tor-commits - lists.torproject.org

[webwml/staging] Merge branch 'master' of git-rw.torproject.org:project/web/webwml into press-updates-01092018
by arma＠torproject.org 29 Mar '18

29 Mar '18

commit 199c3a980fc65573ef8f40f85077eac93be9f65e Merge: 0324504e 0ab31683 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Jan 12 15:41:36 2018 +0100 Merge branch 'master' of git-rw.torproject.org:project/web/webwml into press-updates-01092018 getinvolved/en/tshirt.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[webwml/staging] Bug 24878: Lower Bitpay minimum to 5 USD.
by arma＠torproject.org 29 Mar '18

29 Mar '18

commit bd97432b66445df697c55e85bebec3ab8364ceb9 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Jan 12 03:35:09 2018 -0500 Bug 24878: Lower Bitpay minimum to 5 USD. --- donate/en/donate-options.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 53513557..19410820 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -31,7 +31,7 @@ form#makeDonation { <div class="hundred toptwenty"> <div class="dbox donate"> <h3>Donate Bitcoin</h3> -<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address. (Due to the current state of the Bitcoin market, our payment processor, Bitpay, will not allow us to accept donations of less than 100 USD. However, we can also accept donations, including smaller donations, through Bitcoin Cash. Send us a tip with <a href="https://twitter.com/tipprbot">@tipprbot</a> on Twitter!)</p> +<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address. (Due to the current state of the Bitcoin market, our payment processor, Bitpay, will not allow us to accept donations of less than 5 USD. However, we can also accept donations, including smaller donations, through Bitcoin Cash. Send us a tip with <a href="https://twitter.com/tipprbot">@tipprbot</a> on Twitter!)</p> <form id="makeDonation" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));"> <input name="action" type="hidden" value="checkout"> <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;"> @@ -42,7 +42,7 @@ form#makeDonation { </li> <li id="price" class="control-group"> <label class="control-label" style="width: 80px">Amount:</label> - <input name="price" type="number" class="noscroll" value="100.00" placeholder="Amount" maxlength="10" min="100" step="0.01" /> + <input name="price" type="number" class="noscroll" value="20" placeholder="Amount" maxlength="10" min="1" step="0.01" /> <select name="currency" value="" > <option value="USD" selected="selected">USD</option> <option value="BTC">BTC</option>

1 0

[webwml/staging] Change "three primary ways of contributing" to "two", as only two are listed. (#24812)
by arma＠torproject.org 29 Mar '18

29 Mar '18

commit 0ab316839ba353dae4a555f8c2ab954de854170c Author: kat <kat(a)torproject.org> Date: Wed Jan 10 14:38:14 2018 -0500 Change "three primary ways of contributing" to "two", as only two are listed. (#24812) --- getinvolved/en/tshirt.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getinvolved/en/tshirt.wml b/getinvolved/en/tshirt.wml index c893fb05..4f8c5d53 100644 --- a/getinvolved/en/tshirt.wml +++ b/getinvolved/en/tshirt.wml @@ -14,7 +14,7 @@ <hr> <p>You can get one of these fine Tor T-shirts for contributing to the - Tor project. There are three primary ways of contributing:</p> + Tor project. There are two primary ways of contributing:</p> <ol> <li>Operate a fast <a href="<page docs/tor-doc-relay>">Tor relay</a>

1 0

[webwml/staging] Merge branch 'master' of git-rw.torproject.org:project/web/webwml into tshirt-fix-num-ways
by arma＠torproject.org 29 Mar '18

29 Mar '18

commit 393284333ba470f7b01ba0b2c7a050a98727897c Merge: 836c6dcc 199c3a98 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Jan 12 15:45:30 2018 +0100 Merge branch 'master' of git-rw.torproject.org:project/web/webwml into tshirt-fix-num-ways press/en/press.wml | 12 ++++++++++++ 1 file changed, 12 insertions(+)

1 0

[webwml/staging] Add ubuntu zesty to download options
by arma＠torproject.org 29 Mar '18

29 Mar '18

commit 16dacf3b154c024e98740e07b009af9e168b831d Author: hiromipaw <hiro(a)torproject.org> Date: Fri Jan 12 16:17:42 2018 +0100 Add ubuntu zesty to download options --- Makefile.local~ | 13 +++++++++++++ docs/en/debian.wml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile.local~ b/Makefile.local~ new file mode 100644 index 00000000..fb48555e --- /dev/null +++ b/Makefile.local~ @@ -0,0 +1,13 @@ +# This is a sample for your Makefile.local. +# +# Copy this to Makefile.local and change the path to match your local +# system. +# + +# The path to a clone of the tor source code repository's .git dir. +# Note that if your clone is a non-bare repository that you must not +# leave out the .git part. +# +# e.g.: +# export TORGIT=/home/weasel/projects/tor/tor/.git +export TORGIT=set this to your tor.git path \ No newline at end of file diff --git a/docs/en/debian.wml b/docs/en/debian.wml index f6a58fd2..286e19c6 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -75,9 +75,9 @@ I run <option value="stretch" selected="selected">Debian stable (stretch)</option> <option value="testing">Debian testing (buster)</option> <option value="sid">Debian unstable (sid)</option> -<option value="precise">Ubuntu Precise Pangolin</option> <option value="trusty">Ubuntu Trusty Tahr</option> <option value="xenial">Ubuntu Xenial Xerus</option> +<option value="zesty">Ubuntu Zesty Zapus</option> </select> and want <select id="package"></select>

1 0

[webwml/staging] Remove typo from openBSD installation instructions
by arma＠torproject.org 29 Mar '18

29 Mar '18

commit 4208289646c8d1104fdf88e5a26ac9c2e0e51605 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Jan 12 16:39:03 2018 +0100 Remove typo from openBSD installation instructions --- docs/en/openbsd.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/openbsd.wml b/docs/en/openbsd.wml index 4dd00666..2e3bdc12 100644 --- a/docs/en/openbsd.wml +++ b/docs/en/openbsd.wml @@ -25,7 +25,7 @@ <p>To install the Tor Browser port from an updated ports tree, run:</p> - <pre>cd /usr/ports/meta/tor-browser && make installr</pre> + <pre>cd /usr/ports/meta/tor-browser && make install</pre> </div>

1 0

[webwml/staging] Merge branch 'master' of git-rw.torproject.org:project/web/webwml into add-tor-security-list-info-to-contact
by arma＠torproject.org 29 Mar '18

29 Mar '18

commit b8db3ac06bbec2c22b3bd0be79fc090e269988e6 Merge: a69383c4 67999ec7 Author: hiromipaw <hiro(a)torproject.org> Date: Mon Jan 22 21:50:09 2018 +0100 Merge branch 'master' of git-rw.torproject.org:project/web/webwml into add-tor-security-list-info-to-contact docs/en/debian.wml | 2 +- docs/en/openbsd.wml | 39 +++++++++++++++++++++++++++++++++++++++ docs/en/sidenav.wmi | 3 +++ docs/en/tor-doc-unix.wml | 6 +++--- donate/en/donate-options.wml | 4 ++-- getinvolved/en/tshirt.wml | 2 +- press/en/press.wml | 12 ++++++++++++ 7 files changed, 61 insertions(+), 7 deletions(-)

1 0

[webwml/staging] Bug 24881: consolidate relay setup information (new guide)
by arma＠torproject.org 29 Mar '18

29 Mar '18

commit 41b9624bf787a6dc50b0e52a587ca58259ab59fd Author: nusenu <nusenu-github(a)riseup.net> Date: Fri Jan 19 18:54:14 2018 +0000 Bug 24881: consolidate relay setup information (new guide) - Add new entry to sidenav: Tor Relay Guide - Remove sidenav entry "Installing Tor on Fedora/CentOS" - Remove rpms.wml - Remove sidenav entry "Configuring a Relay graphically" (but do not remove the page itself to not break old urls) - Remove sidenav entry "Configuring a Relay manually" (but do not remove the page itself to not break old urls) --- docs/en/rpms.wml | 47 ----------------------------------------------- docs/en/sidenav.wmi | 12 +++--------- 2 files changed, 3 insertions(+), 56 deletions(-) diff --git a/docs/en/rpms.wml b/docs/en/rpms.wml deleted file mode 100644 index cf779c65..00000000 --- a/docs/en/rpms.wml +++ /dev/null @@ -1,47 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor Project: CentOS/Fedora Instructions" CHARSET="UTF-8" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page docs/documentation>">Documentation » </a> - <a href="<page docs/rpms>">RPMs</a> - </div> - <div id="maincol"> - <a id="rpms"></a> - <h2><a class="anchor" href="#rpms">Tor packages for RPM-based - linux distributions.</a></h2> - <br> - - <h3>Fedora, RHEL, CentOS, Scientific Linux packages</h3> - - <p>Use native Fedora packages for the Fedora distribution or <a href="https://fedoraproject.org/wiki/EPEL">EPEL</a> - packages for distribitons derived from RHEL. - </p> - - - <a id="source"></a> - <h2><a class="anchor" href="#source">Building from source</a></h2> - <br> - - <p> - If you'd like to build from source, please follow the <a - href="<gitblob>doc/contrib/tor-rpm-creation.txt">RPM creation instructions</a>. - </p> - - <hr> - - <p>If you have suggestions for improving this document, please <a - href="<page about/contact>">send them to us</a>. Thanks!</p> - </div> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> diff --git a/docs/en/sidenav.wmi b/docs/en/sidenav.wmi index 3b7b08dd..6ed5f45a 100644 --- a/docs/en/sidenav.wmi +++ b/docs/en/sidenav.wmi @@ -33,12 +33,12 @@ 'url' => 'docs/installguide', 'txt' => 'Expert guides', 'subelements' => [ + {'url' => '<wiki>TorRelayGuide', + 'txt' => 'The Tor Relay Guide', + }, {'url' => 'docs/debian', 'txt' => 'Installing Tor on Debian/Ubuntu', }, - {'url' => 'docs/rpms', - 'txt' => 'Installing Tor on Fedora/CentOS', - }, {'url' => 'docs/openbsd', 'txt' => 'Installing Tor on OpenBSD', }, @@ -48,12 +48,6 @@ {'url' => 'docs/tor-doc-osx', 'txt' => 'OSX', }, - {'url' => 'docs/tor-relay-debian', - 'txt' => 'Configuring a Relay manually', - }, - {'url' => 'docs/tor-doc-relay', - 'txt' => 'Configuring a Relay graphically', - }, {'url' => 'docs/tor-onion-service', 'txt' => 'Configuring an Onion Service', },

1 0

[webwml/staging] Remove tmp file
by arma＠torproject.org 29 Mar '18

29 Mar '18

commit 67999ec78e5913f19f939a39483cb7b31d5f81c1 Author: hiromipaw <hiro(a)torproject.org> Date: Sat Jan 13 13:54:06 2018 +0100 Remove tmp file --- Makefile.local~ | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Makefile.local~ b/Makefile.local~ deleted file mode 100644 index fb48555e..00000000 --- a/Makefile.local~ +++ /dev/null @@ -1,13 +0,0 @@ -# This is a sample for your Makefile.local. -# -# Copy this to Makefile.local and change the path to match your local -# system. -# - -# The path to a clone of the tor source code repository's .git dir. -# Note that if your clone is a non-bare repository that you must not -# leave out the .git part. -# -# e.g.: -# export TORGIT=/home/weasel/projects/tor/tor/.git -export TORGIT=set this to your tor.git path \ No newline at end of file

1 0

[webwml/staging] Add OpenBSD installation instruction
by arma＠torproject.org 29 Mar '18

29 Mar '18

commit 547e1bd8eccda0e712ee802a3f97e54e82b617d0 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Jan 12 16:26:41 2018 +0100 Add OpenBSD installation instruction --- docs/en/openbsd.wml | 39 +++++++++++++++++++++++++++++++++++++++ docs/en/sidenav.wmi | 3 +++ 2 files changed, 42 insertions(+) diff --git a/docs/en/openbsd.wml b/docs/en/openbsd.wml new file mode 100644 index 00000000..4dd00666 --- /dev/null +++ b/docs/en/openbsd.wml @@ -0,0 +1,39 @@ +## 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 » </a> + <a href="<page docs/documentation>">Documentation » </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 installr</pre> + + </div> +  + <div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi> diff --git a/docs/en/sidenav.wmi b/docs/en/sidenav.wmi index 926a3141..3b7b08dd 100644 --- a/docs/en/sidenav.wmi +++ b/docs/en/sidenav.wmi @@ -39,6 +39,9 @@ {'url' => 'docs/rpms', 'txt' => 'Installing Tor on Fedora/CentOS', }, + {'url' => 'docs/openbsd', + 'txt' => 'Installing Tor on OpenBSD', + }, {'url' => 'docs/tor-doc-unix', 'txt' => 'Installing Tor Source', },

1 0