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

[nyx/master] Update copyright dates for 2017
by atagar＠torproject.org 15 Jul '17

15 Jul '17

commit 7b6e4efe1b71f14f5b2f15e5d44c5cafa73fa2c9 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Feb 14 10:30:41 2017 -0800 Update copyright dates for 2017 Bumping the dates for 2017... % find nyx -type f -iname '*.py' -exec sed -i 's/2016/2017/g' "{}" +; --- nyx/__init__.py | 2 +- nyx/arguments.py | 2 +- nyx/curses.py | 2 +- nyx/log.py | 2 +- nyx/menu.py | 2 +- nyx/panel/__init__.py | 2 +- nyx/panel/config.py | 2 +- nyx/panel/connection.py | 2 +- nyx/panel/graph.py | 2 +- nyx/panel/header.py | 2 +- nyx/panel/interpreter.py | 2 +- nyx/panel/log.py | 2 +- nyx/panel/torrc.py | 2 +- nyx/popups.py | 2 +- nyx/starter.py | 2 +- nyx/tracker.py | 2 +- nyx/uninstall | 2 +- run_nyx | 2 +- run_tests.py | 2 +- setup.py | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index 370f954..bb1d074 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2009-2016, Damian Johnson and The Tor Project +# Copyright 2009-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/arguments.py b/nyx/arguments.py index d26a6c5..e55b653 100644 --- a/nyx/arguments.py +++ b/nyx/arguments.py @@ -1,4 +1,4 @@ -# Copyright 2013-2016, Damian Johnson and The Tor Project +# Copyright 2013-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/curses.py b/nyx/curses.py index acac3aa..d1cd5eb 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -1,4 +1,4 @@ -# Copyright 2010-2016, Damian Johnson and The Tor Project +# Copyright 2010-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/log.py b/nyx/log.py index 941de1c..0452891 100644 --- a/nyx/log.py +++ b/nyx/log.py @@ -1,4 +1,4 @@ -# Copyright 2014-2016, Damian Johnson and The Tor Project +# Copyright 2014-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/menu.py b/nyx/menu.py index 9aa5797..580687e 100644 --- a/nyx/menu.py +++ b/nyx/menu.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 24ffadf..d575e42 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2010-2016, Damian Johnson and The Tor Project +# Copyright 2010-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/config.py b/nyx/panel/config.py index 92b8215..d786981 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -1,4 +1,4 @@ -# Copyright 2010-2016, Damian Johnson and The Tor Project +# Copyright 2010-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 2858ee9..41577b6 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 5e7c910..8271b06 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -1,4 +1,4 @@ -# Copyright 2010-2016, Damian Johnson and The Tor Project +# Copyright 2010-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/header.py b/nyx/panel/header.py index d3e7454..9d90d75 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -1,4 +1,4 @@ -# Copyright 2009-2016, Damian Johnson and The Tor Project +# Copyright 2009-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 679cc30..64a9556 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2016-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/log.py b/nyx/panel/log.py index ed3d947..2c93226 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -1,4 +1,4 @@ -# Copyright 2009-2016, Damian Johnson and The Tor Project +# Copyright 2009-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index 46ce895..f43c8b4 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -1,4 +1,4 @@ -# Copyright 2010-2016, Damian Johnson and The Tor Project +# Copyright 2010-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/popups.py b/nyx/popups.py index 0a05a2f..96e9126 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/starter.py b/nyx/starter.py index 0538b0c..d97aaf2 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -1,4 +1,4 @@ -# Copyright 2009-2016, Damian Johnson and The Tor Project +# Copyright 2009-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/tracker.py b/nyx/tracker.py index da0ac13..0e97560 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -1,4 +1,4 @@ -# Copyright 2013-2016, Damian Johnson and The Tor Project +# Copyright 2013-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/uninstall b/nyx/uninstall index c65344c..5448f73 100755 --- a/nyx/uninstall +++ b/nyx/uninstall @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2010-2016, Damian Johnson and The Tor Project +# Copyright 2010-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information files="/usr/bin/nyx /usr/share/man/man1/nyx.1.gz /usr/share/nyx" diff --git a/run_nyx b/run_nyx index be9f55b..8fdce1d 100755 --- a/run_nyx +++ b/run_nyx @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2009-2016, Damian Johnson and The Tor Project +# Copyright 2009-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information import sys diff --git a/run_tests.py b/run_tests.py index 7132518..2b76561 100755 --- a/run_tests.py +++ b/run_tests.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2013-2016, Damian Johnson and The Tor Project +# Copyright 2013-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/setup.py b/setup.py index 81179f7..e9a0fa5 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2010-2016, Damian Johnson and The Tor Project +# Copyright 2010-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information import gzip

1 0

[snowflake/master] Have embed.html refresh itself once a day.
by dcf＠torproject.org 15 Jul '17

15 Jul '17

commit 0ccb4b7cc8b9ececd5da8cb7966fa833bc34c112 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 15 14:38:01 2017 -0700 Have embed.html refresh itself once a day. This is a hedge against any bugs that may cause the badge to hang when left running for a long time, and it also means that badges will effectively check for updated code once a day. --- proxy/static/embed.html | 1 + 1 file changed, 1 insertion(+) diff --git a/proxy/static/embed.html b/proxy/static/embed.html index 2df4354..d1d4e77 100644 --- a/proxy/static/embed.html +++ b/proxy/static/embed.html @@ -2,6 +2,7 @@ <html> <head> <meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + <meta http-equiv="refresh" content="86400"> <script type="text/javascript" src="modernizr.js"></script> <script type="text/javascript" src="snowflake.js"></script> <style>

1 0

[snowflake/master] Remove broker /ip endpoint.
by dcf＠torproject.org 15 Jul '17

15 Jul '17

commit 2a46db2c01985d144e25f537b5019b195af32782 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 15 14:34:18 2017 -0700 Remove broker /ip endpoint. Doesn't seem to be used anywhere; may have been inherited from flash proxy. --- broker/broker.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index d969ce5..a56f40b 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -217,15 +217,6 @@ func robotsTxtHandler(w http.ResponseWriter, r *http.Request) { w.Write([]byte("User-agent: *\nDisallow:\n")) } -func ipHandler(w http.ResponseWriter, r *http.Request) { - remoteAddr := r.RemoteAddr - if net.ParseIP(remoteAddr).To4() == nil { - remoteAddr = "[" + remoteAddr + "]" - } - w.Header().Set("Content-Type", "text/plain; charset=utf-8") - w.Write([]byte(remoteAddr)) -} - func init() { log.SetFlags(log.LstdFlags | log.LUTC) @@ -234,7 +225,6 @@ func init() { go ctx.Broker() http.HandleFunc("/robots.txt", robotsTxtHandler) - http.HandleFunc("/ip", ipHandler) http.Handle("/proxy", SnowflakeHandler{ctx, proxyPolls}) http.Handle("/client", SnowflakeHandler{ctx, clientOffers})

1 0

[meek/master] Use <appname> placeholder consistently.
by dcf＠torproject.org 15 Jul '17

15 Jul '17

commit a26d09988080d84af6687541a1f47e34b3df6a25 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 15 13:49:08 2017 -0700 Use <appname> placeholder consistently. --- appengine/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine/README b/appengine/README index d12f8d2..e498109 100644 --- a/appengine/README +++ b/appengine/README @@ -26,5 +26,5 @@ To configure meek-client to talk to the App Engine app, provide "https://<appname>.appspot.com/" as the url and "www.google.com" as the front domain. UseBridges 1 - Bridge meek 0.0.2.0:1 url=https://example.appspot.com/ front=www.google.com + Bridge meek 0.0.2.0:1 url=https://<appname>.appspot.com/ front=www.google.com ClientTransportPlugin meek exec ./meek-client --log meek-client.log

1 0

[meek/master] Remove a snowflake broker reference.
by dcf＠torproject.org 15 Jul '17

15 Jul '17

commit 8bdbaef8ec37186baabbaa36ab2b441cd7aa4ad8 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 15 13:47:27 2017 -0700 Remove a snowflake broker reference. --- appengine/README | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appengine/README b/appengine/README index d71277a..d12f8d2 100644 --- a/appengine/README +++ b/appengine/README @@ -10,8 +10,7 @@ After unpacking, install the app-engine-go component: To test locally, run google-cloud-sdk/bin/dev_appserver.py app.yaml -The app will be running at http://127.0.0.1:8080/. You can test broker -forwarding function by browsing to http://127.0.0.1:8000/ip. +The app will be running at http://127.0.0.1:8080/. To deploy to App Engine, first create a new project and app. You have to think of a unique name (marked as "<appname>" in the commands). You only

1 0

[meek/master] Update appengine for Google Cloud SDK (gcloud not goapp).
by dcf＠torproject.org 15 Jul '17

15 Jul '17

commit cc12b92e9b03f05cbce82f33d042883d6ffdceab Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 15 12:51:33 2017 -0700 Update appengine for Google Cloud SDK (gcloud not goapp). --- appengine/README | 32 +++++++++++++++++++------------- appengine/app.yaml | 1 - 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/appengine/README b/appengine/README index f819d24..d71277a 100644 --- a/appengine/README +++ b/appengine/README @@ -4,22 +4,28 @@ client and forwards them to the server, then receives responses from the server and forwards them to the client. You need the Go App Engine SDK in order to deploy the app. - https://cloud.google.com/appengine/downloads#Google_App_Engine_SDK_for_Go + https://cloud.google.com/sdk/docs/#linux +After unpacking, install the app-engine-go component: + google-cloud-sdk/bin/gcloud components install app-engine-go To test locally, run - go_appengine/goapp serve -The app will be running at http://127.0.0.1:8080/. To configure -meek-client to talk to the locally running app, put this in torrc: - UseBridges 1 - Bridge meek 0.0.2.0:1 url=http://127.0.0.1:8080/ - ClientTransportPlugin meek exec ./meek-client --log meek-client.log + google-cloud-sdk/bin/dev_appserver.py app.yaml +The app will be running at http://127.0.0.1:8080/. You can test broker +forwarding function by browsing to http://127.0.0.1:8000/ip. + +To deploy to App Engine, first create a new project and app. You have to +think of a unique name (marked as "<appname>" in the commands). You only +have to do the "create" step once; subsequent times you can go straight +to the "deploy" step. This command will open a browser window so you can +log in to a Google account. + google-cloud-sdk/bin/gcloud projects create <appname> + google-cloud-sdk/bin/gcloud app create --project=<appname> +Then to deploy the project, run: + google-cloud-sdk/bin/gcloud app deploy --project=<appname> -To deploy to App Engine, create a Google Account and use it to create a -new app with a unique name. Let's say your app is called "example". Then -to deploy it you run - go_appengine/goapp deploy -application example -To configure meek-client to talk to the App Engine app, give the app's -name as the url and "www.google.com" as the front domain. +To configure meek-client to talk to the App Engine app, provide +"https://<appname>.appspot.com/" as the url and "www.google.com" as the +front domain. UseBridges 1 Bridge meek 0.0.2.0:1 url=https://example.appspot.com/ front=www.google.com ClientTransportPlugin meek exec ./meek-client --log meek-client.log diff --git a/appengine/app.yaml b/appengine/app.yaml index 184eb35..ff6efc1 100644 --- a/appengine/app.yaml +++ b/appengine/app.yaml @@ -1,4 +1,3 @@ -version: 1 runtime: go api_version: go1 automatic_scaling:

1 0

[meek/master] Copy multiple instances of header fields.
by dcf＠torproject.org 15 Jul '17

15 Jul '17

commit 6057a9e9d6b64b81741cf0404957449c8af8529b Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 15 12:54:06 2017 -0700 Copy multiple instances of header fields. Just in case. Previously we only copied the first instance (as provided by Header.Get). --- appengine/reflect.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/appengine/reflect.go b/appengine/reflect.go index bc6992c..ccf11f3 100644 --- a/appengine/reflect.go +++ b/appengine/reflect.go @@ -67,9 +67,11 @@ func copyRequest(r *http.Request) (*http.Request, error) { return nil, err } for _, key := range reflectedHeaderFields { - value := r.Header.Get(key) - if value != "" { - c.Header.Add(key, value) + values, ok := r.Header[key] + if ok { + for _, value := range values { + c.Header.Add(key, value) + } } } // Set the original client IP address in a Meek-IP header. We would use @@ -106,9 +108,11 @@ func handler(w http.ResponseWriter, r *http.Request) { } defer resp.Body.Close() for _, key := range reflectedHeaderFields { - value := resp.Header.Get(key) - if value != "" { - w.Header().Add(key, value) + values, ok := resp.Header[key] + if ok { + for _, value := range values { + w.Header().Add(key, value) + } } } w.WriteHeader(resp.StatusCode)

1 0

[webwml/master] Drop Flash Proxy from volunteer page
by atagar＠torproject.org 15 Jul '17

15 Jul '17

commit 033190caba4df27830b1259db57e8c746bd8dc7c Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 15 12:28:29 2017 -0700 Drop Flash Proxy from volunteer page David gave his ok on... https://trac.torproject.org/projects/tor/ticket/19360 --- getinvolved/en/volunteer.wml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index b4dc2c8..206dbec 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -200,14 +200,6 @@ meetings around the world.</li> </tr> <tr> - <td><a href="#project-flash-proxy">Flash Proxy</a></td> - <td>Client Add-on</td> - <td>Python, JavaScript, Go</td> - <td>Light</td> - <td>dcf, infinity0, Arlo Breault</td> - </tr> - - <tr> <td><a href="#project-shadow">Shadow</a></td> <td>Simulator</td> <td>C, Python</td> @@ -513,17 +505,6 @@ meetings around the world.</li> TorBirdy is Torbutton for Thunderbird and related Mozilla mail clients. </p> - <a id="project-flash-proxy"></a> - <h3><a href="https://crypto.stanford.edu/flashproxy/">Flash Proxy</a> (<a - href="https://gitweb.torproject.org/flashproxy.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug - tracker</a>)</h3> - - <p> - Pluggable transport using proxies running in web browsers to defeat - address-based blocking. - </p> - <a id="project-shadow"></a> <h3><a href="http://shadow.github.io/">Shadow</a> (<a href="https://github.com/shadow">code</a>, <a

1 0

[meek/master] Update an App Engine doc link.
by dcf＠torproject.org 15 Jul '17

15 Jul '17

commit 107038e7d7aac6f93977cb91a8dcb88133751908 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 15 11:53:49 2017 -0700 Update an App Engine doc link. --- appengine/reflect.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine/reflect.go b/appengine/reflect.go index 18d9fe6..bc6992c 100644 --- a/appengine/reflect.go +++ b/appengine/reflect.go @@ -74,7 +74,7 @@ func copyRequest(r *http.Request) (*http.Request, error) { } // Set the original client IP address in a Meek-IP header. We would use // X-Forwarded-For, but App Engine prohibits setting that header: - // https://cloud.google.com/appengine/docs/go/urlfetch/#Go_Request_headers + // https://cloud.google.com/appengine/docs/standard/go/outbound-requests#reque… // We could use Forwarded from RFC 7239, but other CDNs already use // X-Forwarded-For and this way we only need one parser. c.Header.Add("Meek-IP", getClientAddr(r))

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 15 Jul '17

15 Jul '17

commit 3a4f35e33bcbe06eef9eaacb59fbc205e1229dee Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 15 18:16:01 2017 +0000 Update translations for tor-launcher-properties --- sl/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sl/torlauncher.properties b/sl/torlauncher.properties index 197ddc4..44f6757 100644 --- a/sl/torlauncher.properties +++ b/sl/torlauncher.properties @@ -12,8 +12,8 @@ torlauncher.tor_control_failed=Failed to take control of Tor. torlauncher.tor_bootstrap_failed=Tor ni mogel vzpostaviti povezave s Tor omrežjem. torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). -torlauncher.unable_to_start_tor=Tor se ne zažene.\n\n%S -torlauncher.tor_missing=Manjka Torjeva izvršljiva datoteka. +torlauncher.unable_to_start_tor=Tor se ne more zagnati.\n\n%S +torlauncher.tor_missing=Manjka Torova izvršljiva datoteka. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Spodletelo pridobivanje zgoščene vrednosti gesla.

1 0