September 2017 - tor-commits - lists.torproject.org

[webwml/master] Adding homebrew instruction for tor on OSX
by hiro＠torproject.org 07 Sep '17

07 Sep '17

commit 8dc3ae194e9b4fbc1cabf93c2521ff0c65567005 Author: hiromipaw <hiro(a)torproject.org> Date: Thu Sep 7 19:28:57 2017 +0200 Adding homebrew instruction for tor on OSX --- docs/en/tor-doc-osx.wml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/docs/en/tor-doc-osx.wml b/docs/en/tor-doc-osx.wml index 454efa9f..2d31d5dc 100644 --- a/docs/en/tor-doc-osx.wml +++ b/docs/en/tor-doc-osx.wml @@ -25,20 +25,34 @@ this over TBB when they host hidden services or relay traffic for other Tor users. <hr> <a id="installing"></a> - <h2><a class="anchor" href="#installing">Step One: Install Macports</a></h2> + <h2><a class="anchor" href="#installing">Step One: Install A Package Manager</a></h2> <br> + <p>There are two package manager on OS X: Homebrew and Macports. You can use the package manager of your choice.</p> + <p> - Macports is a package manager for Mac OS X which provides a Tor package, - along a lot of other stuff. Follow the instructions on <a - href="https://www.macports.org/install.php">its Website</a> to install. + To install Homebrew follow the instructions on <a + href="https://brew.sh/">brew.sh</a>. + </p> + + <p> + To install Macports follow the instructions on <a + href="https://www.macports.org/install.php">macports.org/install.php</a>. </p> <hr> <h2>Step Two: Install Tor</a></h2> <br> - <p>In a Terminal window, run:</p> + <p>If you are using Homebrw in a Terminal window, run:</p> + + <pre>brew install tor</pre> + + <p>You will find a sample Tor configuration file at + <tt>/usr/local/etc/tor/torrc.sample</tt>. Remove the .sample extension to + make it effective.</p> + + <p>If you are using Macports in a Terminal window, run:</p> <pre>sudo port install tor</pre>

1 0

[tor-browser-build/master] Bug 23403: Use tor-browser-build/tmp rather than /tmp as default tmp_dir
by gk＠torproject.org 07 Sep '17

07 Sep '17

commit b2dd98160a1c07f73f7ab66475cb02be295e4ee5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 7 13:01:02 2017 +0200 Bug 23403: Use tor-browser-build/tmp rather than /tmp as default tmp_dir --- README.BUILD_ERRORS | 16 ---------------- rbm.conf | 1 + rbm.local.conf.example | 6 ++++-- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/README.BUILD_ERRORS b/README.BUILD_ERRORS index 6be4319..0562f93 100644 --- a/README.BUILD_ERRORS +++ b/README.BUILD_ERRORS @@ -28,19 +28,3 @@ nopat $ qvm-pref --set [vmname] kernelopts 'nopat vsyscall=emulate' ---- - -tmp partition is full ---------------------- - -If your /tmp partition is small, you will get a 'No space left on device' -error during the build. To select an other directory with more space -available to store temporary files, you can define the TMPDIR environment -variable: - ----- -$ mkdir /home/user/tmp -$ export TMPDIR=/home/user/tmp ----- - -You can also define the tmp_dir option in the rbm.local.conf file. - diff --git a/rbm.conf b/rbm.conf index e131c36..a93df7f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -2,6 +2,7 @@ debug: '[% GET ! ENV.RBM_NO_DEBUG %]' compress_tar: gz output_dir: "out/[% project %]" +tmp_dir: '[% c("basedir") %]/tmp' build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %]-[% c("var/osname") %].log' pkg_type: build diff --git a/rbm.local.conf.example b/rbm.local.conf.example index 62d13b2..a6401a9 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -6,8 +6,10 @@ ### options you want to modify. -### The tmp_dir option defines where temporary files are stored. -### You should modify this if your /tmp partition is small. +### The tmp_dir option defines where temporary files are stored. The +### builds are made from this directory, so using a directory on a fast +### disk can improve build time. By default we are using a tmp directory +### under the tor-browser-build directory. #tmp_dir: /tmp ### The debug option defines whether a debugging shell should be opened

1 0

[webwml/master] Escaping equals sign in viewport
by hiro＠torproject.org 07 Sep '17

07 Sep '17

commit 56a20c470b33480e8f453defbada60c3cc3a81d9 Author: hiromipaw <hiro(a)torproject.org> Date: Thu Aug 24 16:16:17 2017 +0200 Escaping equals sign in viewport --- Makefile.common | 1 - en/index.wml | 1 + include/head.wmi | 10 +++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile.common b/Makefile.common index f42670e6..ce2c22c2 100644 --- a/Makefile.common +++ b/Makefile.common @@ -26,7 +26,6 @@ WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) $(WMLBASE)/include/*.wmi ) HTMLFILES=$(shell perl -le 's, (.*)/(.*).wml , $$2.html.$$1 ,x, print $$_ for @ARGV' $(WMLFILES)) DEPFILES=$(shell perl -le 's, (.*)/(.*).wml , .deps/$$2.html.$$1.d ,x, print $$_ for @ARGV' $(WMLFILES)) - all: $(HTMLFILES) %.html.en: en/%.wml diff --git a/en/index.wml b/en/index.wml index c9cacf29..4a76adf3 100644 --- a/en/index.wml +++ b/en/index.wml @@ -4,6 +4,7 @@ #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" + <div id="home"> <div id="content" class="clearfix"> <div id="maincol"> diff --git a/include/head.wmi b/include/head.wmi index 9d631a85..dc4d5e26 100644 --- a/include/head.wmi +++ b/include/head.wmi @@ -6,18 +6,22 @@ #use "versions.wmi" #use "navigation.wmi" +<define-tag viewport whitespace=delete> +<meta name="viewport" content="width\=device-width, initial-scale=1"> +</define-tag> + + <!DOCTYPE html> <html> <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <viewport> <meta name="author" content="The Tor Project, Inc."> <meta name="description" content="The Tor Project's free software protects your privacy online. Site blocked? Email [mailto:gettor@torproject.org] for help downloading Tor Browser."> <meta name="keywords" content="tor, tor project, tor browser, avoid censorship, traffic analysis, anonymous communications, privacy, avoid surveillance, online security, anonymous online, private browsing, anonymity online, online privacy, protect privacy, private mac browser, private windows browser, private android browser, linux browser, anonymity network, tor network, onion router, onion browser"> <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg"> - <meta http-equiv="Content-Security-Policy" content="default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://static-na.payments-amazon.com"> {#meta#} <title>$(TITLE)</title> @@ -40,7 +44,7 @@  - # <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> + # <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> # end WML to generate css/js paths </head> <body>

1 0

[webwml/master] Fix torbutton missing jquery error
by hiro＠torproject.org 07 Sep '17

07 Sep '17

commit 1b8063138301abf86c961c35417cd0bfb48b79e5 Author: hiromipaw <hiro(a)torproject.org> Date: Thu Sep 7 15:56:35 2017 +0200 Fix torbutton missing jquery error --- docs/torbutton/en/index.wml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/torbutton/en/index.wml b/docs/torbutton/en/index.wml index c8fe7a44..18f5157e 100644 --- a/docs/torbutton/en/index.wml +++ b/docs/torbutton/en/index.wml @@ -14,6 +14,8 @@ <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/> <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml"/> <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/> + <script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js" charset="utf-8"></script> + <script type="text/javascript" src="$(DOCROOT)/js/jquery.infieldlabel.min.js" charset="utf-8"></script> <script type="text/javascript" src="$(DOCROOT)/js/functions.min.js" charset="utf-8"></script> <h2>Torbutton</h2>

1 0

[webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
by hiro＠torproject.org 07 Sep '17

07 Sep '17

commit 616edbb9b49fe160dd517fde066b472390548536 Merge: 1b806313 88b17d9e Author: hiromipaw <hiro(a)torproject.org> Date: Thu Sep 7 15:56:40 2017 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml Makefile | 2 +- include/versions.wmi | 22 +++++++++++----------- projects/torbrowser/RecommendedTBBVersions | 4 ++++ 3 files changed, 16 insertions(+), 12 deletions(-)

1 0

[webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into staging
by hiro＠torproject.org 07 Sep '17

07 Sep '17

commit 7bf7ad9ebe1628193b1c5f9e3f2a455fd6fd282e Merge: 646ccefe 52c29243 Author: hiromipaw <hiro(a)torproject.org> Date: Mon Aug 14 14:39:21 2017 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into staging about/en/corepeople.wml | 2 +- about/en/sponsors.wml | 16 +++++------ include/versions.wmi | 44 +++++++++++++++--------------- projects/torbrowser/RecommendedTBBVersions | 18 ++++++------ 4 files changed, 39 insertions(+), 41 deletions(-)

1 0

[webwml/master] Fix security policy for amazon donate page
by hiro＠torproject.org 07 Sep '17

07 Sep '17

commit 646ccefe1c6435e24c0cbf64d56abdcbe8fd6ca0 Author: hiromipaw <hiro(a)torproject.org> Date: Tue Aug 8 11:43:45 2017 +0200 Fix security policy for amazon donate page --- include/head.wmi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/head.wmi b/include/head.wmi index 57081b2c..9d631a85 100644 --- a/include/head.wmi +++ b/include/head.wmi @@ -17,7 +17,7 @@ <meta name="description" content="The Tor Project's free software protects your privacy online. Site blocked? Email [mailto:gettor@torproject.org] for help downloading Tor Browser."> <meta name="keywords" content="tor, tor project, tor browser, avoid censorship, traffic analysis, anonymous communications, privacy, avoid surveillance, online security, anonymous online, private browsing, anonymity online, online privacy, protect privacy, private mac browser, private windows browser, private android browser, linux browser, anonymity network, tor network, onion router, onion browser"> <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg"> - <meta http-equiv="Content-Security-Policy" content="default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' payments-amazon.com"> + <meta http-equiv="Content-Security-Policy" content="default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://static-na.payments-amazon.com"> {#meta#} <title>$(TITLE)</title>

1 0

[webwml/master] Merge branch 'master' into staging
by hiro＠torproject.org 07 Sep '17

07 Sep '17

commit a478b99ef1fc09162efd8f12be6c6e71de34d255 Merge: 56a20c47 616edbb9 Author: hiromipaw <hiro(a)torproject.org> Date: Thu Sep 7 15:57:00 2017 +0200 Merge branch 'master' into staging Makefile | 2 +- about/en/jobs-browserdeveloper.wml | 1 - about/en/jobs-developerandroid.wml | 3 +- about/en/jobs-osdeveloperandroid.wml | 139 +++++++++++++++++++++++++++++ about/en/jobs.wml | 2 +- docs/torbutton/en/index.wml | 2 + include/versions.wmi | 22 ++--- press/en/press.wml | 24 +++++ projects/torbrowser/RecommendedTBBVersions | 4 + 9 files changed, 183 insertions(+), 16 deletions(-)

1 0

[webwml/master] Remove typo
by hiro＠torproject.org 07 Sep '17

07 Sep '17

commit f1ad83180a87da261d864153cd5410a0f114e5be Author: hiromipaw <hiro(a)torproject.org> Date: Thu Sep 7 17:44:20 2017 +0200 Remove typo --- docs/torbutton/en/index.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/torbutton/en/index.wml b/docs/torbutton/en/index.wml index 057e1618..956aa206 100644 --- a/docs/torbutton/en/index.wml +++ b/docs/torbutton/en/index.wml @@ -13,7 +13,7 @@ <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/> <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml"/> - <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/>d + <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/> <h2>Torbutton</h2> <hr>

1 0

[webwml/master] Removing obsolete pages and includes
by hiro＠torproject.org 07 Sep '17

07 Sep '17

commit 9d8227b9da745930cbdd3c1789226256427a051e Author: hiromipaw <hiro(a)torproject.org> Date: Thu Sep 7 17:45:43 2017 +0200 Removing obsolete pages and includes --- donate/en/thankyou.wml | 41 ------------- include/thankyou-head.wmi | 146 ---------------------------------------------- 2 files changed, 187 deletions(-) diff --git a/donate/en/thankyou.wml b/donate/en/thankyou.wml deleted file mode 100644 index 6cc70661..00000000 --- a/donate/en/thankyou.wml +++ /dev/null @@ -1,41 +0,0 @@ -## translation metadata -# Revision: $Revision: 24807 $ -# Translation-Priority: 3-low - -#include "thankyou-head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" - - <div id="thanks" class="clearfix hundred"> - <div id="thanks_top"> - <img class="thankyou_h1" src="../images/thankyou_h1.jpg" height="122" width="419" alt="Thank You!"> - <p>Your donation helps support online privacy<br>& censorship circumvention around the globe!</p> - </div> - <div id="thanks_btm"> - <div id="thanks_btm_inner"> - <table> - <tr id="thanks_row"> - <td id="thanks_l"> - <img class="thankyou_h2" src="../images/thankyou_h2.png" height="46" width="195" alt="Keep In Touch!"> - <p>Sign up for our <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-news">newsletter</a></p> - <form Method="POST" ACTION="https://lists.torproject.org/cgi-bin/mailman/subscribe/tor-news"> - <p> - <label class="inactive" for="email">Enter your email address:</label><br> - <input type="text" name="email" id="email" size="25" value=""> - <input id="submit" type="submit" name="email-button" value="GO"> - </p> - </form> - </td> - <td id="thanks_c"> - <div id="v_rule"></div> - </td> - <td id="thanks_r"> - <img class="thankyou_h2" src="../images/thankyou_h3.png" height="46" width="142" alt="Got Skills?"> - <p>Put them to good use</p> - <a href="<page getinvolved/volunteer>">Volunteer for The Tor Project »</a> - </td> - </tr> - </table> - </div> - </div> - </div> - -#include <foot.wmi> diff --git a/include/thankyou-head.wmi b/include/thankyou-head.wmi deleted file mode 100644 index 193c70bf..00000000 --- a/include/thankyou-head.wmi +++ /dev/null @@ -1,146 +0,0 @@ -#! /usr/bin/wml -<: use strict; :> -<: use warnings; :> -#use "perl-globals.wmi" -#use "links.wmi" -#use "versions.wmi" -#use "navigation.wmi" - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<html> -<head> - <title>$(TITLE)</title> - <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico"> - <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> - <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> - - # begin WML to generate css/js paths - <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">"> - <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.min.css">"> - - <link href="$(DOCROOT)/css/thankyou.min.css" rel="stylesheet" type="text/css"> -  -  -  -# <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> - # end WML to generate css/js paths - - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <meta name="author" content="The Tor Project, Inc."> - <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> -<script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js" charset="utf-8"></script> -<script type="text/javascript" src="$(DOCROOT)/js/jquery.infieldlabel.min.js" charset="utf-8"></script> -<script type="text/javascript" src="$(DOCROOT)/js/functions.min.js" charset="utf-8"></script> -</head> -<body> -<div id="wrap"> - <div id="header"> - <h1 id="logo"><a href="<page index>">Tor</a></h1> - # navigation menu generation - <div id="nav"> - <ul> - <:{ - # create a hash and maintain order of keys - my %navigation; - my @keys; - while (@navigation) { - my $key = shift @navigation; - my $val = shift @navigation; - push @keys, $key; - $navigation{$key} = $val; - } - - my $page = $WML_SRC_BASENAME; - my $lang = "$(LANG)"; - - for my $key (@keys) { - my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; - - # in directory of active link, set class active - my $class; - if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { - $class = 'class="active"'; - } else { - $class = ''; - } - - $dir = '.' unless defined $dir; - - # translated version - if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { - printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", - stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key}; - } - # english version - elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { - printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", - stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $navigation{$key}; - } - # full url - elsif ($key =~/^http/) { - printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key}; - } else { - warn "$WML_SRC_FILENAME has a [page $key] (parses to -docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; - } - } - }:> - </ul> - </div> -  - # end navigation generation - <div id="calltoaction"> - <ul> - <:{ - my %calltoaction; - my @keys; - while (@calltoaction) { - my $key = shift @calltoaction; - my $val = shift @calltoaction; - push @keys, $key; - $calltoaction{$key} = $val; - } - - my $page = $WML_SRC_BASENAME; - my $lang = "$(LANG)"; - for my $key (@keys) { - my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; - - # in directory, set active - my $class; - if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { - #if ($WML_SRC_BASENAME eq $base) { - $class = 'class="active"'; - } else { - $class = ''; - } - - $dir = '.' unless defined $dir; - # try to use a translated version - if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { - printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", - stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key}; - } - # default to english version - elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { - printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", - stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key}; - } else { - warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; - } - } - }:> - </ul> - </div> -  - </div> -  - -#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>."> -#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>.">

1 0