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

[webwml/master] Text for giving assistant should be p
by hiro＠torproject.org 28 Nov '17

28 Nov '17

commit a990fa78973bdde09c95a7266ec959e1811c73f3 Author: hiromipaw <hiro(a)torproject.org> Date: Tue Nov 28 11:11:19 2017 +0100 Text for giving assistant should be p --- donate/en/donate-options.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 162574c9..5c18976c 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -118,7 +118,7 @@ form#makeDonation { <div class="hundred toptwenty"> <div class="dbox donate"> <h3>Donate via Giving Assistant</h3> - <h4>Giving Assistant helps you donate a percentage of your cash back earnings to us with every purchase you make at 3,000+ popular online retailers.</h4> + <p>Giving Assistant helps you donate a percentage of your cash back earnings to us with every purchase you make at 3,000+ popular online retailers.</p> <p> <strong> <a href="https://givingassistant.org/np#tor-project-inc">Use Giving Assistant to save money and support the Tor Project</a>

1 0

[compass/master] Add warning that Compass will be shut down
by karsten＠torproject.org 28 Nov '17

28 Nov '17

commit d75ee1a23839a998987b3b3bd34c837cca68febd Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Mon Nov 27 21:04:20 2017 +0000 Add warning that Compass will be shut down --- templates/index.html | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/templates/index.html b/templates/index.html index d59c15b..54d6137 100644 --- a/templates/index.html +++ b/templates/index.html @@ -53,15 +53,12 @@ <div class="nav-collapse"> <ul class="nav"> <li class="active"><a href="/">Home</a></li> - <li><a href="https://trac.torproject.org/projects/tor/ticket/6498">Trac - Ticket #6498</a></li> </ul> </div> <div> <ul class="nav pull-right"> <li><a href="https://gitweb.torproject.org/compass.git">Source code</a></li> - <li><a href="https://trac.torproject.org/projects/tor/newticket?component=Compass">Report a bug</a></li> - <li><a href="mailto:tor-assistants@lists.torproject.org">Contact</a> </li> + <li><a href="https://metrics.torproject.org/about.html#contact">Contact</a> </li> </ul> </div> </div> @@ -70,6 +67,18 @@ <div class="container" ng-controller="CompassCtrl"> <div class="hero-unit"> + <div class="alert alert-danger"> + <p>The Tor Metrics team plans to shut down the Compass service at the + end of December 2017. Aggregated search functionality has been + integrated into <a href="https://atlas.torproject.org/#aggregate">Relay + Search</a> (formerly known as Atlas) to give a unified tool for + exploring both single relays and aggregations of relays.<p> + <p>Please ensure that all the functionality you require is available + in Relay Search before Compass is shut down. If any functionality is + missing, please <a + href="https://trac.torproject.org/projects/tor/newticket?component=Metrics/Atlas&…">file + a ticket to request that it be added</a>.</p> + </div> <form class="form-horizontal" id="form"> <fieldset> <legend>Compass</legend>

1 0

[bridgedb/develop] Fix the moat server to only generate QRcodes when asked to do so.
by isis＠torproject.org 27 Nov '17

27 Nov '17

commit 039884c4f19bb3f52b076e1bc5901800b5258fe1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Nov 27 23:22:33 2017 +0000 Fix the moat server to only generate QRcodes when asked to do so. * FIXES #24443: https://bugs.torproject.org/24443 --- bridgedb/distributors/moat/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/distributors/moat/server.py b/bridgedb/distributors/moat/server.py index daf62fa..eb356fe 100644 --- a/bridgedb/distributors/moat/server.py +++ b/bridgedb/distributors/moat/server.py @@ -560,7 +560,7 @@ class CaptchaCheckResource(CaptchaResource): "Transport '%s' is not currently supported" % data["transport"]) else: - qrcode = data["qrcode"] + qrcode = True if data["qrcode"] == "true" else False transport = type('')(data["transport"]) challenge = type('')(data["challenge"]) solution = type('')(data["solution"])

1 0

[bridgedb/develop] Merge branch 'fix/24443' into develop
by isis＠torproject.org 27 Nov '17

27 Nov '17

commit cb3f4b4aa27b527bfb000cc254d08622b90a526e Merge: 76d3c5b 039884c Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Nov 27 23:26:17 2017 +0000 Merge branch 'fix/24443' into develop bridgedb/distributors/moat/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[bridgedb/develop] Make the test-moat script easier to input challenges and solutions.
by isis＠torproject.org 27 Nov '17

27 Nov '17

commit 8245b6a2c4f4697a33b1c169529aed66b6e1a55a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Nov 27 19:13:54 2017 +0000 Make the test-moat script easier to input challenges and solutions. --- scripts/test-moat | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/scripts/test-moat b/scripts/test-moat index 6bfa500..490edc6 100755 --- a/scripts/test-moat +++ b/scripts/test-moat @@ -1,7 +1,10 @@ #!/usr/bin/env bash +CHALLENGE= +SOLUTION= + function usage() { - printf "Usage: %s [fetch] [check]\n" "$(basename $0)" + printf "Usage: %s [fetch] [check [challenge solution]]\n" "$(basename $0)" } if test "$#" -lt 1 ; then @@ -20,17 +23,32 @@ function do_fetch() { function do_check() { curl -H 'Content-Type: application/vnd.api+json' \ -H 'Accept: application/vnd.api+json' \ - --data '{"data": [{"challenge": "foo", "solution": "bar", "version": "0.1.0", "qrcode": "false", "type": "moat-solution", "id": 2, "transport": "obfs4"}]}' \ + --data '{"data": [{"challenge": "'$CHALLENGE'", "solution": "'$SOLUTION'", "version": "0.1.0", "qrcode": "false", "type": "moat-solution", "id": 2, "transport": "obfs4"}]}' \ http://127.0.0.1:6790/meek/moat/check echo } while test -n "$1" ; do + OPTSHIFT=1 + case "$1" in fetch) do_fetch ;; - check) do_check ;; + check) if [[ "$2" != "fetch" ]] ; then + CHALLENGE="$2" + if [[ "$3" != "fetch" ]] ; then + SOLUTION="$3" + fi + fi + for var in "$CHALLENGE" "$SOLUTION" ; do + if test -n "$var"; then + OPTSHIFT=$(( OPTSHIFT + 1 )) + fi + done + do_check ;; + *) usage ;; esac - shift + shift $OPTSHIFT + OPTSHIFT=1 done

1 0

[bridgedb/develop] Send correct X-Forwarded-For headers in test-moat script.
by isis＠torproject.org 27 Nov '17

27 Nov '17

commit a1597da01eb30e7222dc153a81cd7575a889f8ff Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Nov 27 19:30:03 2017 +0000 Send correct X-Forwarded-For headers in test-moat script. --- bridgedb/bridgerequest.py | 2 +- scripts/test-moat | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bridgedb/bridgerequest.py b/bridgedb/bridgerequest.py index 560b704..e555e0a 100644 --- a/bridgedb/bridgerequest.py +++ b/bridgedb/bridgerequest.py @@ -149,7 +149,7 @@ class BridgeRequestBase(object): mod the number of nodes in the hashring. """ if not client: - client = self.client + client = type('')(self.client) # Get an HMAC with the key of the client identifier: digest = getHMACFunc(key)(client) diff --git a/scripts/test-moat b/scripts/test-moat index 490edc6..13b835e 100755 --- a/scripts/test-moat +++ b/scripts/test-moat @@ -15,6 +15,7 @@ fi function do_fetch() { curl -H 'Content-Type: application/vnd.api+json' \ -H 'Accept: application/vnd.api+json' \ + -H 'X-Forwarded-For: 1.2.3.4' \ --data '{"data": [{"supported": ["obfs4"], "version": "0.1.0", "type": "client-transports"}]}' \ http://127.0.0.1:6790/meek/moat/fetch echo @@ -23,6 +24,7 @@ function do_fetch() { function do_check() { curl -H 'Content-Type: application/vnd.api+json' \ -H 'Accept: application/vnd.api+json' \ + -H 'X-Forwarded-For: 1.2.3.4' \ --data '{"data": [{"challenge": "'$CHALLENGE'", "solution": "'$SOLUTION'", "version": "0.1.0", "qrcode": "false", "type": "moat-solution", "id": 2, "transport": "obfs4"}]}' \ http://127.0.0.1:6790/meek/moat/check echo

1 0

[bridgedb/develop] Merge branch 'fix/24433' into develop
by isis＠torproject.org 27 Nov '17

27 Nov '17

commit 76d3c5bca779c78236a8dffb389304412e97af5e Merge: 8245b6a a1597da Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Nov 27 19:38:27 2017 +0000 Merge branch 'fix/24433' into develop bridgedb/bridgerequest.py | 2 +- scripts/test-moat | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[webwml/master] Add giving assistant to donate options
by hiro＠torproject.org 27 Nov '17

27 Nov '17

commit 53906d0652d0b440fd746c8fa1ba4929cc204d2d Author: hiromipaw <hiro(a)torproject.org> Date: Mon Nov 27 20:39:45 2017 +0100 Add giving assistant to donate options --- donate/en/donate-options.wml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 86b9af8f..898307ae 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -19,6 +19,7 @@ form#makeDonation { <li><a href="#bitcoin">Bitcoin</a></li> <li><a href="<page donate/donate-amazon>">Amazon Payments</a></li> <li><a href="https://smile.amazon.com/ch/20-8096820">Amazon Smile</a></li> + <li><a href="https://givingassistant.org/np#tor-project-inc">Giving Assistant</a></li> <li><a href="#eubanks">EU Bank Transfer</a></li> <li><a href="#cash">Checks or Money Orders</a></li> <li><a href="#stock">Donate Stock</a></li> @@ -112,6 +113,21 @@ form#makeDonation { </p> </div>  + + <a id="giving"></a> + <div class="hundred toptwenty"> + <div class="dbox donate"> + <h3>Donate via Giving Assistant</h3> + <h4>Giving Assistant helps you donate a percentage of your cash back earnings to us with every purchase you make at 3,000+ popular online retailers.</h4> + <p> + <strong> + <a href="https://givingassistant.org/np#tor-project-inc">Use Giving Assistant to save money and support the Tor Project</a> + </strong> + </p> + </div> + </div> + +  <a id="eubanks"></a> <div class="">

1 0

[webwml/master] Remove broken link on donate options page
by hiro＠torproject.org 27 Nov '17

27 Nov '17

commit 1731e62da0de1e28fef357b56aa868cc53733a83 Author: hiromipaw <hiro(a)torproject.org> Date: Mon Nov 27 20:40:59 2017 +0100 Remove broken link on donate options page --- donate/en/donate-options.wml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 898307ae..162574c9 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -133,8 +133,7 @@ form#makeDonation { <div class=""> <h3 style="margin-top:20px;">Donate via European Bank Transfer</h3> <p>For European bank transfers, we have an arrangement with - the Renewable Freedom Foundation to provide -<a href="http://www.solicitorsjournal.com/news/private-client/charities/gifts-foreig…">tax-deductible</a> + the Renewable Freedom Foundation to provide tax-deductible donations for Europeans. They will issue a donation receipt <a href="https://renewablefreedom.org/contact/">upon request</a>. The account information is as follows:</p>

1 0

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

27 Nov '17

commit c69eb984b93efb9779dd867787098b67f663852e Merge: 1731e62d 3f17add4 Author: hiromipaw <hiro(a)torproject.org> Date: Mon Nov 27 20:41:21 2017 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml about/en/contributors.wml | 3 - about/en/corepeople.wml | 152 ++++++++++++---------------- css/people-table.css | 40 ++++++++ images/people/orig/redshiftzero.jpg | Bin 0 -> 51523 bytes images/people/redshiftzero.png | Bin 0 -> 45395 bytes keys/redshiftzero.txt | 191 ++++++++++++++++++++++++++++++++++++ 6 files changed, 292 insertions(+), 94 deletions(-)

1 0