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

[tor/release-0.3.1] Merge remote-tracking branch 'public/bug23275_031' into maint-0.3.1
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit a7aeb6f58f24e30c329874204a5f0db4b65bb2f0 Merge: 6307a759e 86ee35ad5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 4 11:39:28 2017 -0400 Merge remote-tracking branch 'public/bug23275_031' into maint-0.3.1 changes/bug23275 | 5 +++++ src/or/main.c | 2 +- src/or/networkstatus.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'public/bug23275_031' into maint-0.3.1
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit a7aeb6f58f24e30c329874204a5f0db4b65bb2f0 Merge: 6307a759e 86ee35ad5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 4 11:39:28 2017 -0400 Merge remote-tracking branch 'public/bug23275_031' into maint-0.3.1 changes/bug23275 | 5 +++++ src/or/main.c | 2 +- src/or/networkstatus.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit e2e13e7c8a2a40074805a19651d7837484d3a8b8 Merge: 209bfe715 a7aeb6f58 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 4 11:40:02 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23275 | 5 +++++ src/or/main.c | 2 +- src/or/networkstatus.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.1] Merge remote-tracking branch 'public/bug23275_031' into maint-0.3.1
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit a7aeb6f58f24e30c329874204a5f0db4b65bb2f0 Merge: 6307a759e 86ee35ad5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 4 11:39:28 2017 -0400 Merge remote-tracking branch 'public/bug23275_031' into maint-0.3.1 changes/bug23275 | 5 +++++ src/or/main.c | 2 +- src/or/networkstatus.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit 3a5cf9aa2f50eccbdbbb6f7e04753479c7763e1b Merge: faa28d40e a7aeb6f58 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 4 11:40:01 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23275 | 5 +++++ src/or/main.c | 2 +- src/or/networkstatus.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)

1 0

[metrics-base/master] Set target and source to Java 8.
by karsten＠torproject.org 04 Sep '17

04 Sep '17

commit a64b94a635e5396266d5c5b5cf88850b9f4b6a24 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Jul 3 09:15:17 2017 +0000 Set target and source to Java 8. Prepares migration to Java 8 for all Metrics' products. --- java/base.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/base.xml b/java/base.xml index 4793d7b..1fc33cf 100644 --- a/java/base.xml +++ b/java/base.xml @@ -23,7 +23,7 @@ value="${name}-${release.version}-sources.jar" /> <property name="jardocsfile" value="${name}-${release.version}-javadoc.jar" /> - <property name="source-and-target-java-version" value="1.7" /> + <property name="source-and-target-java-version" value="1.8" /> <property name="release.tarball" value="${dist}/${name}-${release.version}.tar.gz" /> <property file="build.properties" />

1 0

[metrics-web/master] Update news.json to version 124 of doc/MetricsTimeline.
by karsten＠torproject.org 04 Sep '17

04 Sep '17

commit e6baccc576928917dcb93e5c5af8f2cc2658f1e8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 4 11:50:02 2017 +0200 Update news.json to version 124 of doc/MetricsTimeline. --- website/src/main/resources/etc/news.json | 51 ++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index 4418ae3..d679d5f 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -1089,6 +1089,18 @@ ] }, { + "start": "2017-08-14", + "end": "2017-08-15", + "protocols": [ + "bridge" + ], + "description": "Outage of the bridge authority <a href=\"https://atlas.torproject.org/#details/1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D…">Bifroest</a>.", + "links": [ + "<a href=\"https://lists.torproject.org/pipermail/metrics-team/2017-August/000441.html\">mailing list post</a>", + "<a href=\"https://metrics.torproject.org/networksize.html?start=2017-07-01&end=2017-0…">graph</a>" + ] + }, + { "start": "2016-02-24", "place": "tm", "protocols": [ @@ -1417,5 +1429,44 @@ "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-05-1…">relay graph</a>" ], "unknown": true + }, + { + "start": "2017-08-15", + "place": "hk", + "protocols": [ + "<OR>", + "relay" + ], + "description": "Triple increase in direct Tor users in Hong Kong. Bridge users not affected.", + "links": [ + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-06-0…">relay graph</a>" + ], + "unknown": true + }, + { + "start": "2017-08-22", + "place": "eg", + "protocols": [ + "<OR>", + "relay" + ], + "description": "More than 8x sudden increase in direct Tor users in Egypt. Bridge users not affected.", + "links": [ + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-06-0…">relay graph</a>" + ], + "unknown": true + }, + { + "start": "2017-08-22", + "place": "tr", + "protocols": [ + "<OR>", + "relay" + ], + "description": "Massive sudden increase of relay users in Turkey. Bridge users not affected.", + "links": [ + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-06-0…">relay graph</a>" + ], + "unknown": true } ]

1 0

[metrics-web/master] Put back constructors.
by karsten＠torproject.org 04 Sep '17

04 Sep '17

commit 00d9a7d552a4fd254dd8e21f46b4be8c5166c82b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 4 11:00:46 2017 +0200 Put back constructors. In dfdc2c3 we removed three constructors that looked unused, but turns out that was not the case. Let's just put them back. --- .../org/torproject/metrics/hidserv/ComputedNetworkFractions.java | 6 ++++++ .../org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java | 6 ++++++ .../java/org/torproject/metrics/hidserv/ReportedHidServStats.java | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java b/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java index 3ab90f3..54c80c8 100644 --- a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java +++ b/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java @@ -119,6 +119,12 @@ public class ComputedNetworkFractions implements Document { private static Map<String, Long> previouslyParsedDates = Collections.synchronizedMap(new HashMap<String, Long>()); + /** Instantiates an empty fractions object that will be initialized more + * by the parse method. + * + * Invoked by {@link DocumentStore#retrieve} via reflection. */ + ComputedNetworkFractions() {} + /** Initializes this fractions object using the two provided strings * that have been produced by the format method earlier and returns * whether this operation was successful. */ diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java b/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java index d38174a..60f9ce0 100644 --- a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java +++ b/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java @@ -118,6 +118,12 @@ public class ExtrapolatedHidServStats implements Document { return new String[] { first, second }; } + /** Instantiates an empty stats object that will be initialized more by + * the parse method. + * + * Invoked by {@link DocumentStore#retrieve} via reflection. */ + ExtrapolatedHidServStats() {} + /** Initializes this stats object using the two provided strings that * have been produced by the format method earlier and returns whether * this operation was successful. */ diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java b/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java index 6f2d548..66a81c4 100644 --- a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java +++ b/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java @@ -97,6 +97,12 @@ public class ReportedHidServStats implements Document { return new String[] { first, second }; } + /** Instantiate an empty stats object that will be initialized more by + * the parse method. + * + * Invoked by {@link DocumentStore#retrieve} via reflection. */ + ReportedHidServStats() {} + /* Initialize this stats object using the two provided strings that have * been produced by the format method earlier. Return whether this * operation was successful. */

1 0

[stem/master] Fix pids_by_user for FreeBSD
by atagar＠torproject.org 03 Sep '17

03 Sep '17

commit f90ef8087d3bd0d95041272480e0554c113942f6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 3 14:39:50 2017 -0700 Fix pids_by_user for FreeBSD Turns out FreeBSD uses an uppercase '-U' argument rather than '-u'... https://trac.torproject.org/projects/tor/ticket/23281#comment:7 --- stem/util/system.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index 391c4b70..a563db45 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -129,7 +129,8 @@ GET_PID_BY_PORT_NETSTAT = 'netstat -npltu' GET_PID_BY_PORT_SOCKSTAT = 'sockstat -4l -P tcp -p %s' GET_PID_BY_PORT_LSOF = 'lsof -wnP -iTCP -sTCP:LISTEN' GET_PID_BY_FILE_LSOF = 'lsof -tw %s' -GET_PIDS_BY_USER = 'ps -o pid -u %s' +GET_PIDS_BY_USER_LINUX = 'ps -o pid -u %s' +GET_PIDS_BY_USER_BSD = 'ps -o pid -U %s' GET_CWD_PWDX = 'pwdx %s' GET_CWD_LSOF = 'lsof -a -p %s -d cwd -Fn' GET_BSD_JAIL_ID_PS = 'ps -p %s -o jid' @@ -861,7 +862,10 @@ def pids_by_user(user): # 915 if is_available('ps'): - results = call(GET_PIDS_BY_USER % user, None) + if is_bsd(): + results = call(GET_PIDS_BY_USER_BSD % user, None) + else: + results = call(GET_PIDS_BY_USER_LINUX % user, None) if results: try:

1 0

[stem/master] Drop '--encoding=ascii' from man command on FreeBSD
by atagar＠torproject.org 03 Sep '17

03 Sep '17

commit fe1512cfd500135bb3e059a35cc4ecc0aeeb3ed1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 3 14:36:26 2017 -0700 Drop '--encoding=ascii' from man command on FreeBSD We ran into issues with this argument on OSX. Turns out it's a no-go on FreeBSD too... https://trac.torproject.org/projects/tor/ticket/23281#comment:7 --- stem/manual.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/manual.py b/stem/manual.py index 18a5d34d..6e4869cf 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -485,7 +485,7 @@ class Manual(object): :raises: **IOError** if unable to retrieve the manual """ - man_cmd = 'man %s -P cat %s' % ('' if stem.util.system.is_mac() else '--encoding=ascii', man_path) + man_cmd = 'man %s -P cat %s' % ('' if (stem.util.system.is_mac() or stem.util.system.is_bsd()) else '--encoding=ascii', man_path) try: man_output = stem.util.system.call(man_cmd, env = {'MANWIDTH': '10000000'})

1 0