October 2014 - tor-commits - lists.torproject.org

[webwml/master] update readme to know about git
by arma＠torproject.org 20 Oct '14

20 Oct '14

commit 87ab12b73b2f27519aaebcfafa3646bf70432925 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Oct 19 20:34:18 2014 -0400 update readme to know about git --- README | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README b/README index 0c93dfc..2d66da2 100644 --- a/README +++ b/README @@ -1,13 +1,13 @@ Here are the instructions I sent David Fifield when he asked about editing the website. I hope they are useful for you too! --Roger -See the Makefile.local file in your website/trunk/ directory. Uncomment -TORGIT and point it to a tor git. +Copy Makefile.local.sample to Makefile.local in your webwml/ directory. +Point TORGIT to a tor git. Then apt-get install wml and (alas) probably a shocking number of other debs. Then you can type 'make' and it will build the website for you locally. It's probably a smart move to see whether 'make' works before -you svn commit any changes to the wml file. +you git commit any changes to the wml files. You can edit docs/en/pluggable-transports.wml (and that is the right source file to edit, not the html). But go take a @@ -21,14 +21,14 @@ too -- generally when you change the file name so drastically that just changing the versions.wmi tags isn't enough.) Pushes to the master branch of the git repository will cause the -website to get re-built and published. pushing to the staging branch +website to get re-built and published. Pushing to the staging branch will update www-staging.torproject.org. Alas, https://www.torproject.org/dist/ isn't in version control. You -write to it by ssh'ing to staticiforme.torproject.org and going to +write to it by ssh'ing to dist-master.torproject.org and going to /srv/dist-master.torproject.org/htdocs/ and then sticking your stuff there. When you want it to go live, you run -static-update-component dist.torproject.org on staticiforme. +"static-update-component dist.torproject.org" on dist-master. Weasel has hopes that somebody will write some scripts to make maintaining packages in dist/ less awful -- automatically check that they have

1 0

[webwml/master] give a typo in a mirror url
by arma＠torproject.org 20 Oct '14

20 Oct '14

commit f4d29c12c32a25b4cc78db8aaf34628a3b406103 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Oct 19 20:33:51 2014 -0400 give a typo in a mirror url --- include/tor-mirrors.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv index c70cdc9..fc106ab 100644 --- a/include/tor-mirrors.csv +++ b/include/tor-mirrors.csv @@ -24,7 +24,7 @@ info AT zentrum-der-gesundheit DOT de, Zentrum der Gesundheit, DK, Denmark, Euro mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, TRUE, FALSE, No, http://mirror.ntzk.de/torproject.org/, , , , http://mirror.ntzk.de/torproject.org/dist/, , , , Thu Oct 9 19:32:00 2014 info /AT enn /DOT lu, Frenn vun der Enn A.S.B.L., IS, Iceland, Europe, TRUE, FALSE, No, http://torproject.lu/, , , , http://torproject.lu/dist/, , , http://btn6gqzqevlhoryd.onion, Thu Oct 9 19:32:00 2014 Piratenpartei Bayern, Piratenpartei Bayern, DE, Germany, DE, TRUE, FALSE, NO, http://tormirror.piratenpartei-bayern.de, https://tormirror.piratenpartei-bayern.de, , , http://tormirror.piratenpartei-bayern.de/dist/, http://tormirror.piratenpartei-bayern.de/dist/, , , Thu Oct 9 19:32:00 2014 -Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, http://tor.hoi-polloi.org, http://tor.hossi-polloiorg, , , http://tor.hoi-polloi.org/dist/, http://tor.hosi-polloi.or/dist/g, , , Thu Oct 9 19:32:00 2014 +Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, http://tor.hoi-polloi.org, http://tor.hossi-polloiorg, , , http://tor.hoi-polloi.org/dist/, http://tor.hosi-polloi.org/dist/, , , Thu Oct 9 19:32:00 2014 kevinmg(a)pressfreedomfoundation.org, Freedom of the Press Foundation, US, United States, US, True, False, No, http://tor.pressfreedomfoundation.org, https://tor.pressfreedomfoundation.org, , , http://tor.pressfreedomfoundation.org/dist/, https://tor.pressfreedomfoundation.org/dist/, , , Wed Oct 8 16:48:11 2014 tor(a)fodt.it // FoDT.it Webteam, FoDT.it, AT, Austria, Europe, TRUE, FALSE, No, http://tor.fodt.it, https://tor.fodt.it, , ftp://ftp.fodt.it/pub/mirrors/torproject.org/, http://tor.fodt.it/dist/, https://tor.fodt.it/dist/, , , Sun Aug 24 16:19:07 2014 http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, TRUE, TRUE, No, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Thu Oct 9 19:32:00 2014 @@ -91,4 +91,4 @@ admin AT nuclear DASH weapons DOT net, Setec Administrator, US, Texas, Austin, T opi(a)zeropi.net, Tor Supporter, FR, France, FR, TRUE, TRUE, No, http://tor-mirror.zeropi.net/, , , , http://tor-mirror.zeropi.net/dist/, , , , Thu Oct 9 19:32:00 2014 noc AT bbln DOT org,BBLN,NL,The Netherlands,Europe,TRUE,TRUE,No,http://mirror-nl1.bbln.org/torproject/,http…,, noc AT bbln DOT org,BBLN,FR,France,Europe,TRUE,TRUE,No,http://mirror-fr1.bbln.org/torprojec…,, -noc AT bbln DOT org,BBLN,FR,France,Europe,TRUE,TRUE,No,http://mirror-fr2.bbln.org/torprojec…,, \ No newline at end of file +noc AT bbln DOT org,BBLN,FR,France,Europe,TRUE,TRUE,No,http://mirror-fr2.bbln.org/torprojec…,,

1 0

[webwml/master] new instructions in the Makefile
by arma＠torproject.org 19 Oct '14

19 Oct '14

commit 12da0388a756599b819f7184d53479464d1c287c Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Oct 19 19:30:14 2014 -0400 new instructions in the Makefile --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b5808af..51f8f77 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,11 @@ # 2. Edit include/versions.wmi or others if you like # 3. Update STABLETAG and DEVTAG below if there is a new git tag # 4. make -# 5. ./publish +# 5. Do a git commit for your changes + +# Then either 6a) git push to staging or master, or 6b) push your git +# branch to your personal webwml repository, open a trac ticket in the +# website component, and set it to needs_review. export STABLETAG=tor-0.2.4.24 export DEVTAG=tor-0.2.5.8-rc

1 0

[webwml/master] Fixed GooglePlay Orbot link
by sebastian＠torproject.org 19 Oct '14

19 Oct '14

commit 2809765f41c2a223f2fb8b8213f2a0ee9812a612 Author: Colin <colin(a)torproject.org> Date: Sun Oct 19 18:00:31 2014 -0500 Fixed GooglePlay Orbot link --- download/en/download.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download/en/download.wml b/download/en/download.wml index 65e756e..9382512 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -213,7 +213,7 @@ custom configurations. All an apt-get or yum install away.</p> </div> <h2>Android Bundle</h2> - <p>Our software is available for Android-based phones, tablets, and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in their <a href= "https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">F-Droid Repository</a> or the <a href="https://market.android.com/search?q=guardianproject&so=1&c=apps">Google Play Store</a>.</p> + <p>Our software is available for Android-based phones, tablets, and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in their <a href= "https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">F-Droid Repository</a> or the <a href="https://play.google.com/store/apps/details?id=org.torproject.android">Google Play Store</a>.</p> </div>  <div class="package" style="border-bottom: 0px;">

1 0

[webwml/master] Add OONI to the project page
by sebastian＠torproject.org 19 Oct '14

19 Oct '14

commit 7857cc2b3b4aecbec24133b874e1c7a587369b0e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Oct 20 00:17:22 2014 +0200 Add OONI to the project page --- images/icon-OONI.png | Bin 0 -> 12729 bytes projects/en/projects.wml | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/images/icon-OONI.png b/images/icon-OONI.png new file mode 100644 index 0000000..b03d3df Binary files /dev/null and b/images/icon-OONI.png differ diff --git a/projects/en/projects.wml b/projects/en/projects.wml index e5f40ab..e3f4604 100644 --- a/projects/en/projects.wml +++ b/projects/en/projects.wml @@ -153,6 +153,24 @@ documentation. On PyPI and in Debian. </div> </div> +<div class="projectbox"> +<a href="https://ooni.torproject.org/"><img class="icon" +src="$(IMGROOT)/icon-OONI.png" alt="OONI Icon" width="75" +height="75"></a> +<div class="projectdesc"> +<div class="name"><a +href="https://ooni.torproject.org/">OONI</a></div> +<p> +The Open Observatory of Network Interference, is a global observation +network which aims is to collect high quality data using open methodologies, +using Free and Open Source Software (FL/OSS) to share observations and data +about the various types, methods, and amounts of network tampering in the +world. +</p> +</div> +</div> + + </table>  </div>

1 0

[webwml/master] remove confusing language about deprecated vidalia bundles
by sebastian＠torproject.org 19 Oct '14

19 Oct '14

commit 3e345eaf5f1b698c61b7d7814a9c1c028e15cda0 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Oct 20 00:08:07 2014 +0200 remove confusing language about deprecated vidalia bundles --- docs/en/tor-doc-relay.wml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/en/tor-doc-relay.wml b/docs/en/tor-doc-relay.wml index 685289a..fd025a1 100644 --- a/docs/en/tor-doc-relay.wml +++ b/docs/en/tor-doc-relay.wml @@ -47,11 +47,10 @@ <p>Alas, since Vidalia (a graphical interface for Tor) is <a href="<page docs/faq>#WhereDidVidaliaGo">no longer included</a> in the standard Tor Browser Bundle, there are currently no - easy relay packages for OS X users. One option is to run - Debian in a VM; another option is to install TBB and then a - standalone Vidalia bundle on top of it; and a third option is to <a - href="https://lists.torproject.org/pipermail/tor-relays/2014-June/004650.html">use - Homebrew</a>. Please help make this process easier! + easy relay packages for OS X users. One option might be to run + Debian in a VM, or use a different means of getting a Tor binary on + your system (Homebrew, Macports). Please help make this process + easier! </p> <hr>

1 0

[webwml/master] Fix transifex signup url
by sebastian＠torproject.org 19 Oct '14

19 Oct '14

commit 360a1c82af144669a1e3150efb0704780dcb1c9b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Oct 19 23:31:20 2014 +0200 Fix transifex signup url --- getinvolved/en/translation-overview.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getinvolved/en/translation-overview.wml b/getinvolved/en/translation-overview.wml index f27f9d5..7082199 100644 --- a/getinvolved/en/translation-overview.wml +++ b/getinvolved/en/translation-overview.wml @@ -59,7 +59,7 @@ lets users <p> To get started with Transifex, you need to sign up for an account. Visit the <a - href="https://www.transifex.com/accounts/register/">account + href="https://www.transifex.com/signup/">account registration page</a> to get started. Be sure to enter a proper email address and a strong password. Once that's done, click on the resource you wish to

1 0

[webwml/master] https-ify some rpm urls
by sebastian＠torproject.org 19 Oct '14

19 Oct '14

commit 3ec754dc446e7834e2d9d8878a8ef757820340c3 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Oct 19 23:14:54 2014 +0200 https-ify some rpm urls --- docs/en/rpms.wml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/en/rpms.wml b/docs/en/rpms.wml index 4de0975..8744dbb 100644 --- a/docs/en/rpms.wml +++ b/docs/en/rpms.wml @@ -37,17 +37,17 @@ <pre>[tor] name=Tor repo enabled=1 -baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/$basearch/ +baseurl=https://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/$basearch/ gpgcheck=1 -gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc +gpgkey=https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc [tor-source] name=Tor source repo enabled=1 autorefresh=0 -baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS +baseurl=https://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS gpgcheck=1 -gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc +gpgkey=https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc </pre> <p> The keys's fingerprint should be (for RPM-GPG-KEY-torproject.org.asc above, @@ -111,7 +111,7 @@ gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.… DISTRIBUTION based on your distribution; for source rpms use "SRPMS" instead of $basearch): </p> -<pre>baseurl=http://deb.torproject.org/torproject.org/rpm/tor-testing/DISTRIBUTI…</pre> +<pre>baseurl=https://deb.torproject.org/torproject.org/rpm/tor-testing/DISTRIBUT…</pre> <a id="source"></a> <h2><a class="anchor" href="#source">Building from source</a></h2>

1 0

[webwml/master] we don't have opensuse RPMs, apparently
by sebastian＠torproject.org 19 Oct '14

19 Oct '14

commit 045f63bd85032a9ff39e93f2c55535c28b5f402d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Oct 19 23:02:00 2014 +0200 we don't have opensuse RPMs, apparently --- docs/en/rpms.wml | 2 +- docs/en/tor-doc-unix.wml | 2 +- download/en/download-unix.wml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en/rpms.wml b/docs/en/rpms.wml index a6b70a3..4de0975 100644 --- a/docs/en/rpms.wml +++ b/docs/en/rpms.wml @@ -2,7 +2,7 @@ # Revision: $Revision$ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: CentOS/Fedora/OpenSUSE Instructions" CHARSET="UTF-8" +#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> diff --git a/docs/en/tor-doc-unix.wml b/docs/en/tor-doc-unix.wml index b4cde97..0f7b0cb 100644 --- a/docs/en/tor-doc-unix.wml +++ b/docs/en/tor-doc-unix.wml @@ -30,7 +30,7 @@ Red Hat, Gentoo, *BSD, etc there too. If you're using Ubuntu, don't use the default packages: use <a href="<page docs/debian>#ubuntu">our deb repository</a> instead. - Similarly, CentOS / Fedora / OpenSUSE users should use <a href="<page + Similarly, CentOS / Fedora users should use <a href="<page docs/rpms>">our rpm repository</a> instead. </p> diff --git a/download/en/download-unix.wml b/download/en/download-unix.wml index 4415648..a4e6ac9 100644 --- a/download/en/download-unix.wml +++ b/download/en/download-unix.wml @@ -37,8 +37,8 @@ </tr> <tr class="beige"> -<td align="center"><img src="$(IMGROOT)/distros/centos.png" alt="CentOS"> <img src="$(IMGROOT)/distros/fedora.png" alt="Fedora"> <img src="$(IMGROOT)/distros/suse.png" alt="openSUSE 11"></td> -<td>CentOS, Fedora, OpenSUSE</td> +<td align="center"><img src="$(IMGROOT)/distros/centos.png" alt="CentOS"> <img src="$(IMGROOT)/distros/fedora.png" alt="Fedora"></td> +<td>CentOS and Fedora</td> <td colspan="2"><a href="<page docs/rpms>">repository packages</a> </td> <td> <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a> </td> </tr>

1 0

[webwml/master] tor-mirrors is ever so vigilant
by sebastian＠torproject.org 19 Oct '14

19 Oct '14

commit 4f467992118221361d7a44dcbed6a8918f1ff85d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Oct 19 22:14:40 2014 +0200 tor-mirrors is ever so vigilant --- docs/en/running-a-mirror.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/running-a-mirror.wml b/docs/en/running-a-mirror.wml index cf3bbc9..ad8762c 100644 --- a/docs/en/running-a-mirror.wml +++ b/docs/en/running-a-mirror.wml @@ -58,7 +58,7 @@ rsync -av --delete rsync://rsync.torproject.org/dist-mirror tor-mirror/dist/ <tt> <pre> # m h dom mon dow command -0 */6 * * * rsync -aq --delete rsync://rsync.torproject.org/website-mirror/ /var/www/mirrors/torproject.org +0 */6 * * * rsync -aq --exclude 'dist' --delete rsync://rsync.torproject.org/website-mirror/ /var/www/mirrors/torproject.org 5 */6 * * * rsync -aq --delete rsync://rsync.torproject.org/dist-mirror/ /var/www/mirrors/torproject.org/dist </pre> </tt>

1 0