June 2016 - tor-commits - lists.torproject.org

[ooni-probe/master] Fix indentation of torrc option (#510)
by art＠torproject.org 12 Jun '16

12 Jun '16

commit 8459fdc93dd59ba5d2da23a0c0e45ed18b5b6e3e Author: anadahz <anadahz(a)users.noreply.github.com> Date: Sun Jun 5 17:26:04 2016 +0000 Fix indentation of torrc option (#510) * Fix indentation of torrc option * Add Bridge YAML format example to use meek bridges --- data/ooniprobe.conf.sample | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index 72a8e06..fec1026 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -63,3 +63,9 @@ tor: #HTTPProxyAuthenticator: user:password #HTTPSProxy: host:port #HTTPSProxyAuthenticator: user:password + #UseBridges: 1 + #Bridge: + #- "meek_lite 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com" + #- "meek_lite 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com" + #- "meek_lite 0.0.2.0:3 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com" + #ClientTransportPlugin: "meek_lite exec /usr/bin/obfs4proxy"

1 0

[ooni-probe/master] Adds Debian stable backports installation instructions
by art＠torproject.org 12 Jun '16

12 Jun '16

commit 44567a37572af166fb13a5430b9746c752cdbea9 Author: Iain R. Learmonth <irl(a)debian.org> Date: Fri Jun 10 23:52:19 2016 +0100 Adds Debian stable backports installation instructions --- README.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.rst b/README.rst index 64f942b..af6de55 100644 --- a/README.rst +++ b/README.rst @@ -51,6 +51,12 @@ On Debian testing or unstable:: sudo apt-get install ooniprobe +On Debian stable (jessie):: + + echo 'deb http://ftp.debian.org/debian jessie-backports main' | sudo tee -a /etc/apt/sources.list + sudo apt-get update + sudo apt-get install ooniprobe + On Ubuntu 16.04 (xenial), 15.10 (wily) or 14.04 (trusty):: sudo add-apt-repository ppa:irl/ooni

1 0

[ooni-probe/master] Add Debian and Ubuntu installation instructions now the PPA is fixed (#533)
by art＠torproject.org 12 Jun '16

12 Jun '16

commit 3f513430bd0e6b7430140d6d010bdc782985083c Author: Iain Learmonth <irl(a)fsfe.org> Date: Fri Jun 10 15:16:06 2016 +0100 Add Debian and Ubuntu installation instructions now the PPA is fixed (#533) --- README.rst | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/README.rst b/README.rst index 1c2ec82..64f942b 100644 --- a/README.rst +++ b/README.rst @@ -47,6 +47,16 @@ probe is a liability for you, please be aware of this risk. OONI in 5 minutes ================= +On Debian testing or unstable:: + + sudo apt-get install ooniprobe + +On Ubuntu 16.04 (xenial), 15.10 (wily) or 14.04 (trusty):: + + sudo add-apt-repository ppa:irl/ooni + sudo apt-get update + sudo apt-get install ooniprobe + On unix systems:: sudo pip install ooniprobe @@ -60,26 +70,15 @@ Then run:: mkdir my_decks oonideckgen -o my_decks/ -**BUG** Note: -ooniprobe version 1.2.2 when installed from the debian repository will not -properly create the ooni home folder and if you run into an error in accessing -`~/.ooni/` run:: - - ooniprobe -n blocking/http_requests -u http://google.com/ - -This should generate the home and allow you to run oonideckgen. - -The output from the last command will tell you how to run ooniprobe to perform -the measurement. - -If you would like to contribute measurements to OONI daily you can also add -this to your crontab:: +If you're using the Debian package, you will be asked when installing whether +you would like to run OONI daily. On other platforms, if you would like to +contribute measurements to OONI daily you can also add this to your crontab:: @daily ooniprobe $THE_OONI_COMMAND Run this command to automatically update your crontab:: - (crontab -l 2>/dev/null; echo "@daily ooniprobe $THE_OONI_COMMAND") | crontab - + (crontab -l 2>/dev/null; echo "@daily ooniprobe $THE_OONI_COMMAND") | crontab - Installation ============

1 0

[ooni-probe/master] bump ooniprobe master version to 1.5.2.dev1
by art＠torproject.org 12 Jun '16

12 Jun '16

commit c21861c28ca6bd667715872d099006fab87222fd Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Jun 10 14:49:26 2016 +0200 bump ooniprobe master version to 1.5.2.dev1 --- ooni/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index 2ec1a8a..5280b1e 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "1.5.1" +__version__ = "1.5.2.dev1" # This is the version number of resources to be downloaded # when a release is made it should be aligned to __version__ __resources_version__ = "1.5.1"

1 0

[ooni-probe/master] Merge pull request #536 from irl/fix/debian-stable-install-doc
by art＠torproject.org 12 Jun '16

12 Jun '16

commit 7d0cd2457dd6572ad27d3356f74b67e57eba6e2d Merge: 3f51343 44567a3 Author: anadahz <anadahz(a)users.noreply.github.com> Date: Fri Jun 10 23:30:04 2016 +0000 Merge pull request #536 from irl/fix/debian-stable-install-doc Adds Debian stable backports installation instructions README.rst | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[metrics-web/master] Remove the "Tor Cloud bridges" graph.
by karsten＠torproject.org 12 Jun '16

12 Jun '16

commit 784296292460ab46e7984699f3b9fee44bca216d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jun 12 17:42:25 2016 +0200 Remove the "Tor Cloud bridges" graph. The Tor Cloud project was discontinued in May 2015, so there's no real point in keeping a graph that shows how the number of Tor Cloud bridges slowly goes down to zero. Implements #18769. --- website/etc/metrics.json | 27 ++------------------------- website/etc/web.xml | 4 ---- website/rserve/graphs.R | 30 ------------------------------ 3 files changed, 2 insertions(+), 59 deletions(-) diff --git a/website/etc/metrics.json b/website/etc/metrics.json index 03e8b85..1aac409 100644 --- a/website/etc/metrics.json +++ b/website/etc/metrics.json @@ -20,8 +20,7 @@ "related": [ "relayflags", "versions", - "platforms", - "cloudbridges" + "platforms" ] }, { @@ -97,27 +96,6 @@ ] }, { - "id": "cloudbridges", - "title": "Tor Cloud bridges", - "tags": [ - "Bridges" - ], - "type": "Graph", - "level": "Basic", - "description": "<p>The following graph shows the number of running <a href=\"about.html#bridge\">bridges</a> that are deployed in <a href=\"http://aws.amazon.com/ec2/\">Amazon's EC2 cloud</a> using images provided by <a href=\"https://cloud.torproject.org/\">Tor Cloud</a>. These bridges have, by default, a nickname that starts with \"ec2bridger\" which bridge operators usually leave unchanged.</p>", - "function": "plot_cloudbridges", - "parameters": [ - "start", - "end" - ], - "data": [ - "servers-data" - ], - "related": [ - "networksize" - ] - }, - { "id": "servers-data", "title": "Number of relays and bridges", "tags": [ @@ -143,8 +121,7 @@ "networksize", "relayflags", "versions", - "platforms", - "cloudbridges" + "platforms" ] }, { diff --git a/website/etc/web.xml b/website/etc/web.xml index 8587947..809cc41 100644 --- a/website/etc/web.xml +++ b/website/etc/web.xml @@ -29,7 +29,6 @@ <url-pattern>/relayflags.html</url-pattern> <url-pattern>/versions.html</url-pattern> <url-pattern>/platforms.html</url-pattern> - <url-pattern>/cloudbridges.html</url-pattern> <url-pattern>/bandwidth.html</url-pattern> <url-pattern>/bwhist-flags.html</url-pattern> <url-pattern>/bandwidth-flags.html</url-pattern> @@ -131,9 +130,6 @@ <url-pattern>/networksize.png</url-pattern> <url-pattern>/networksize.pdf</url-pattern> <url-pattern>/networksize.svg</url-pattern> - <url-pattern>/cloudbridges.png</url-pattern> - <url-pattern>/cloudbridges.pdf</url-pattern> - <url-pattern>/cloudbridges.svg</url-pattern> <url-pattern>/relaycountries.png</url-pattern> <url-pattern>/relaycountries.pdf</url-pattern> <url-pattern>/relaycountries.svg</url-pattern> diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R index cfae47c..d304395 100644 --- a/website/rserve/graphs.R +++ b/website/rserve/graphs.R @@ -303,36 +303,6 @@ plot_networksize <- function(start, end, path) { ggsave(filename = path, width = 8, height = 5, dpi = 72) } -plot_cloudbridges <- function(start, end, path) { - end <- min(end, as.character(Sys.Date() - 2)) - s <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "servers.csv", sep = ""), stringsAsFactors = FALSE) - s <- s[s$date >= start & s$date <= end & s$flag == '' & - s$country == '' & s$version == '' & s$platform == '' & - s$ec2bridge == 't', ] - s <- data.frame(date = as.Date(s$date, "%Y-%m-%d"), bridges = s$bridges) - dates <- seq(from = as.Date(start, "%Y-%m-%d"), - to = as.Date(end, "%Y-%m-%d"), by="1 day") - missing <- setdiff(dates, s$date) - if (length(missing) > 0) - s <- rbind(s, - data.frame(date = as.Date(missing, origin = "1970-01-01"), - bridges = NA)) - date_breaks <- date_breaks( - as.numeric(max(as.Date(s$date, "%Y-%m-%d")) - - min(as.Date(s$date, "%Y-%m-%d")))) - ggplot(s, aes(x = as.Date(date, "%Y-%m-%d"), y = bridges)) + - geom_line(size = 1, colour = "green3") + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), - format = date_breaks$format, major = date_breaks$major, - minor = date_breaks$minor) + - scale_y_continuous(name = "", limits = c(0, - max(s$bridges, na.rm = TRUE))) + - opts(title = "Number of Tor Cloud bridges\n") - ggsave(filename = path, width = 8, height = 5, dpi = 72) -} - plot_relaycountries <- function(start, end, country, path) { end <- min(end, as.character(Sys.Date() - 2)) s <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/",

1 0

[tor/master] Remove -Wc11-extensions
by nickm＠torproject.org 11 Jun '16

11 Jun '16

commit 80f2c3555d70261fb62d24f7fb2e9199cf377777 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 11 17:37:34 2016 -0400 Remove -Wc11-extensions FreeBSD uses _Generic() in its system headers, and is within its rights to do so. --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 382bb76..03ada37 100644 --- a/configure.ac +++ b/configure.ac @@ -1710,7 +1710,6 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then -Wbool-conversion -Wbool-conversions -Wbuiltin-requires-header - -Wc11-extensions -Wc99-c11-compat -Wchar-align -Wcompare-distinct-pointer-types

1 0

[tor/master] Fix build on 32-bit systems.
by nickm＠torproject.org 11 Jun '16

11 Jun '16

commit 47edbd4fad564f0d7412ec8605f4c0846e9f1abe Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 11 13:26:05 2016 -0400 Fix build on 32-bit systems. --- src/ext/ed25519/donna/ed25519-donna.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/ext/ed25519/donna/ed25519-donna.h b/src/ext/ed25519/donna/ed25519-donna.h index 64561d3..299c8d9 100644 --- a/src/ext/ed25519/donna/ed25519-donna.h +++ b/src/ext/ed25519/donna/ed25519-donna.h @@ -10,6 +10,16 @@ #include "ed25519-donna-portable.h" +#include "orconfig.h" + +#ifdef HAVE_CFLAG_WOVERLENGTH_STRINGS +/* Some of the ASM here is very long strings. */ +#ifdef __clang__ +#pragma clang diagnostic ignored "-Woverlength-strings" +#else +#pragma GCC diagnostic ignored "-Woverlength-strings" +#endif +#endif #if defined(ED25519_SSE2) #else

1 0

[tor/master] Whoops -- this got lost in the merge.
by nickm＠torproject.org 11 Jun '16

11 Jun '16

commit cb71c5ddbb9ae8de96ddfae6eca5114dc294a49b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 11 12:58:24 2016 -0400 Whoops -- this got lost in the merge. --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index a5546bc..382bb76 100644 --- a/configure.ac +++ b/configure.ac @@ -1916,6 +1916,9 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then if test "$tor_cv_cflags__Wnull_dereference" = "yes"; then AC_DEFINE([HAVE_CFLAG_WNULL_DEREFERENCE], 1, [True if we have -Wnull-dereference]) fi + if test "$tor_cv_cflags__Woverlength_strings" = "yes"; then + AC_DEFINE([HAVE_CFLAG_WOVERLENGTH_STRINGS], 1, [True if we have -Woverlength-strings]) + fi if test "x$enable_fatal_warnings" = "xyes"; then # I'd like to use TOR_CHECK_CFLAGS here, but I can't, since the

1 0

[tor/master] Add support for temporarily suppressing a warning
by nickm＠torproject.org 11 Jun '16

11 Jun '16

commit 0279e4847352111254503159685487e5e1f58681 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 27 11:23:52 2016 -0400 Add support for temporarily suppressing a warning There are a few places where we want to disable a warning: for example, when it's impossible to call a legacy API without triggering it, or when it's impossible to include an external header without triggering it. This pile of macros uses GCC's c99 _Pragma support, plus the usual macro trickery, to enable and disable warnings. --- src/common/compat.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/common/compat.h b/src/common/compat.h index b6ee410..6f102be 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -82,6 +82,44 @@ #define CHECK_SCANF(formatIdx, firstArg) #endif +/* What GCC do we have? */ +#ifdef __GNUC__ +#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) +#else +#define GCC_VERSION 0 +#endif + +/* Temporarily enable and disable warnings. */ +#ifdef __GNUC__ +# define PRAGMA_STRINGIFY_(s) #s +# define PRAGMA_JOIN_STRINGIFY_(a,b) PRAGMA_STRINGIFY_(a ## b) +/* Support for macro-generated pragmas (c99) */ +# define PRAGMA_(x) _Pragma (#x) +# ifdef __clang__ +# define PRAGMA_DIAGNOSTIC_(x) PRAGMA_(clang diagnostic x) +# else +# define PRAGMA_DIAGNOSTIC_(x) PRAGMA_(GCC diagnostic x) +# endif +# if defined(__clang__) || GCC_VERSION >= 406 +/* we have push/pop support */ +# define DISABLE_GCC_WARNING(warning) \ + PRAGMA_DIAGNOSTIC_(push) \ + PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_(-W,warning)) +# define ENABLE_GCC_WARNING(warning) \ + PRAGMA_DIAGNOSTIC_(pop) +# else +/* older version of gcc: no push/pop support. */ +# define DISABLE_GCC_WARNING(warning) \ + PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_(-W,warning)) +# define ENABLE_GCC_WARNING(warning) \ + PRAGMA_DIAGNOSTIC_(warning PRAGMA_JOIN_STRINGIFY_(-W,warning)) +# endif +#else /* ifdef __GNUC__ */ +/* not gcc at all */ +# define DISABLE_GCC_WARNING(warning) +# define ENABLE_GCC_WARNING(warning) +#endif + /* inline is __inline on windows. */ #ifdef _WIN32 #define inline __inline

1 0