[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit dba8ffc7e52ce46b16c1b22de1e2587e30b1c836 Author: Translation commit bot Date: Wed Dec 20 08:15:39 2017 + Update translations for https_everywhere --- ta/ssl-observatory.dtd | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ta/ssl-observatory.dtd b/ta/ssl-observatory.dtd index a46a53599..ef8807f28 100644 --- a/ta/ssl-observatory.dtd +++ b/ta/ssl-observatory.dtd @@ -53,10 +53,9 @@ to turn it on?">--> +"HTTPS à®à®à¯à®à¯à®®à¯ -à®à®²à¯ EFF-னà¯à®à¯à®¯ SSL à®à®£à¯à®à®¾à®£à®¿à®ªà¯à®ªà®¿à®©à¯ பயனà¯à®ªà®à¯à®¤à¯à®¤ à®®à¯à®à®¿à®¯à¯à®®à¯. à®à®¤à¯ à®à®°à®£à¯à®à¯ விà®à®¯à®à¯à®à®³à¯ à®à¯à®¯à¯à®¯à¯à®®à¯: +(1) +HTTPS à®à®¾à®©à¯à®±à®¿à®¤à®´à¯à®à®³à¯ பிரதிà®à®³à¯ à®à®£à¯à®à®¾à®£à®¿à®ªà¯à®ªà®à®¤à¯à®¤à®¿à®±à¯à®à¯ ஠னà¯à®ªà¯à®ªà®¿, ">
[tor-commits] [exonerator/master] Prepare for 2.0.2 release.
commit 55409c9142845275b518f8db4eecc6a7976efb9a Author: Karsten Loesing Date: Tue Dec 19 17:12:17 2017 +0100 Prepare for 2.0.2 release. --- CERT | 21 + CHANGELOG.md | 12 build.xml| 2 +- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/CERT b/CERT new file mode 100644 index 000..ca92db0 --- /dev/null +++ b/CERT @@ -0,0 +1,21 @@ +-BEGIN CERTIFICATE- +MIIDaTCCAlGgAwIBAgIEPrK+4DANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV +UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU +b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTcx +MTE3MTA0MDQ5WhcNMTgwMjE1MTA0MDQ5WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE +CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj +dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU +6aTpAjDMeaT4ctUwxH4+56Sbcf/wB0vEFBbX8MyRd1eY02PKwMVJ6VBhjOQcIlrd +Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE +MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD +oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX +lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud +DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAIqRy +T4uMqw1WwZ8CtJx5kSs/or+5025bGK6V2dY/jYapZcbyG7sq3KVFAqLik8Yn7a0D +dfbmtR7r2jbkWhYppa7MGSQ6SMG6nxas05l8yf9ShDnNLtJoay8JyGPeucaFyEwV +VxwN9/I4M4chrrvBzpMB/1U3oJxlKR+nssh4w55DoUijk3vHn01+20EPU9uNJrsr +mXhcrJLU/4R952ZMLxtiBfNP7vaxLpQctNqZxEfa9/rm0pLlfd2t62BWf8kkGqEy +Ke4WdNpQwk3WKjFlKWcvsF6ztJJlwA+qHk4IB9PynVRNggWimBrxWigbeBL8qpML +A5xMtX/MHDXreWGaKA== +-END CERTIFICATE- diff --git a/CHANGELOG.md b/CHANGELOG.md index 1169f73..1bc4d1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# Changes in version 2.0.2 - 2017-12-20 + + * Major changes + - Reject queries for the current day or the day before, because the + database may not yet contain enough data to correctly answer + those requests. + + * Minor changes + - Add catch-all clauses to servlets to catch and log any unforeseen + errors. + + # Changes in version 2.0.1 - 2017-11-22 * Minor changes diff --git a/build.xml b/build.xml index 1a83f50..a881138 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ - + https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [exonerator/master] Bump version to 2.0.2-dev.
commit c4acc1d54af589f9141f8f9982caaa5bdc35ffc4 Author: Karsten Loesing Date: Wed Dec 20 09:38:09 2017 +0100 Bump version to 2.0.2-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index a881138..b82ce0a 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ - + https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Adapt .gitignore to new structure.
commit 8b82720ea4f87ad365a243e56ac47badbbae49c9 Author: iwakeh Date: Mon Dec 4 11:14:18 2017 + Adapt .gitignore to new structure. --- .gitignore | 29 ++--- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 8f49baf..8234621 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,23 @@ -# Eclipse files -/.classpath -/.project +# hidden files +.* -# Generated web archive -/website/metrics.war +# Generated stuff +/generated/ +/stats/ +/lib/ +LOGBASE_IS_UNDEFINED/ +cobertura.ser +*.csv +*.RData +*.pyc +*.log -# Compiled class files -*.class - -# Possibly modified config file -/website/etc/context.xml +# library folder +/lib/ # Copied and possibly modified config file -/website/etc/config +config + +# other +*~ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Add ant task for clients run.
commit c0e7cd031c0b06b6e61c926ddb3f4b15d14f9eaa
Author: iwakeh
Date: Mon Dec 4 11:14:28 2017 +
Add ant task for clients run.
Move related sources to main src tree,
delete old build.xml and shell script.
---
build.xml | 58 ++
modules/clients/.gitignore | 2 -
modules/clients/build.xml | 11
shared/bin/80-run-clients-stats.sh | 34 -
{modules => src/main/R}/clients/merge-clients.R| 0
{modules => src/main/R}/clients/split-clients.R| 0
.../main/R}/clients/userstats-detector.R | 0
.../java/org/torproject/metrics/clients/Main.java | 0
.../main/python}/clients/country_info.py | 0
{modules => src/main/python}/clients/detector.py | 0
.../main/sql}/clients/init-userstats.sql | 0
.../main/sql}/clients/test-userstats.sql | 0
12 files changed, 58 insertions(+), 47 deletions(-)
diff --git a/build.xml b/build.xml
index 09857ba..78f17d0 100644
--- a/build.xml
+++ b/build.xml
@@ -155,6 +155,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/clients/.gitignore b/modules/clients/.gitignore
deleted file mode 100644
index 29a7166..000
--- a/modules/clients/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.csv
-
diff --git a/modules/clients/build.xml b/modules/clients/build.xml
deleted file mode 100644
index f67bdae..000
--- a/modules/clients/build.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/shared/bin/80-run-clients-stats.sh
b/shared/bin/80-run-clients-stats.sh
deleted file mode 100755
index fe93e44..000
--- a/shared/bin/80-run-clients-stats.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-cd modules/clients/
-
-echo `date` "Parsing descriptors."
-ant | grep "\[java\]"
-
-for i in $(ls out/*.sql)
-do
- echo `date` "Importing $i."
- psql -f $i userstats
-done
-
-echo `date` "Exporting results."
-psql -c 'COPY (SELECT * FROM estimated) TO STDOUT WITH CSV HEADER;' userstats
> userstats.csv
-psql -c 'COPY (SELECT * FROM combined) TO STDOUT WITH CSV HEADER;' userstats >
userstats-combined.csv
-
-echo `date` "Running censorship detector."
-R --slave -f userstats-detector.R > /dev/null 2>&1
-python detector.py
-
-echo `date` "Merging censorship detector results."
-R --slave -f merge-clients.R > /dev/null 2>&1
-mkdir -p stats/
-cp clients.csv stats/
-cp userstats-combined.csv stats/
-
-echo `date` "Saving results as .RData files."
-R --slave -f split-clients.R > /dev/null 2>&1
-
-echo `date` "Terminating."
-
-cd ../../
-
diff --git a/modules/clients/merge-clients.R
b/src/main/R/clients/merge-clients.R
similarity index 100%
rename from modules/clients/merge-clients.R
rename to src/main/R/clients/merge-clients.R
diff --git a/modules/clients/split-clients.R
b/src/main/R/clients/split-clients.R
similarity index 100%
rename from modules/clients/split-clients.R
rename to src/main/R/clients/split-clients.R
diff --git a/modules/clients/userstats-detector.R
b/src/main/R/clients/userstats-detector.R
similarity index 100%
rename from modules/clients/userstats-detector.R
rename to src/main/R/clients/userstats-detector.R
diff --git
a/modules/clients/src/main/java/org/torproject/metrics/clients/Main.java
b/src/main/java/org/torproject/metrics/clients/Main.java
similarity index 100%
rename from
modules/clients/src/main/java/org/torproject/metrics/clients/Main.java
rename to src/main/java/org/torproject/metrics/clients/Main.java
diff --git a/modules/clients/country_info.py
b/src/main/python/clients/country_info.py
similarity index 100%
rename from modules/clients/country_info.py
rename to src/main/python/clients/country_info.py
diff --git a/modules/clients/detector.py b/src/main/python/clients/detector.py
similarity index 100%
rename from modules/clients/detector.py
rename to src/main/python/clients/detector.py
diff --git a/modules/clients/init-userstats.sql
b/src/main/sql/clients/init-userstats.sql
similarity index 100%
rename from modules/clients/init-userstats.sql
rename to src/main/sql/clients/init-userstats.sql
diff --git a/modules/clients/test-userstats.sql
b/src/main/sql/clients/test-userstats.sql
similarity index 100%
rename from modules/clients/test-userstats.sql
rename to src/main/sql/clients/test-userstats.sql
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Begin creation of standard build environment.
commit c350ba41caaf910d345e130de89aec25af90312a
Author: iwakeh
Date: Mon Dec 4 11:14:12 2017 +
Begin creation of standard build environment.
Add bootstrap script, metrics-base submodule, move metrics-lib submodule.
---
.gitmodules | 7 +--
src/build | 1 +
src/main/resources/bootstrap-development.sh | 10 ++
{submods => src/submods}/metrics-lib| 0
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 7e4601a..99bca1b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
-[submodule "submods/metrics-lib"]
- path = submods/metrics-lib
+[submodule "src/build"]
+ path = src/build
+ url = https://git.torproject.org/metrics-base.git
+[submodule "src/submods/metrics-lib"]
+ path = src/submods/metrics-lib
url = https://git.torproject.org/metrics-lib.git
diff --git a/src/build b/src/build
new file mode 16
index 000..23c6e0b
--- /dev/null
+++ b/src/build
@@ -0,0 +1 @@
+Subproject commit 23c6e0be5fab9463f137615053ef412e4da2315e
diff --git a/src/main/resources/bootstrap-development.sh
b/src/main/resources/bootstrap-development.sh
new file mode 100755
index 000..28fb975
--- /dev/null
+++ b/src/main/resources/bootstrap-development.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# Copyright 2016--2017 The Tor Project
+# See LICENSE for licensing information
+#
+# Use for submodule initialization and checkout.
+# Only necessary after very first checkout without recursion.
+#
+git submodule update --init --remote
+
diff --git a/submods/metrics-lib b/src/submods/metrics-lib
similarity index 100%
rename from submods/metrics-lib
rename to src/submods/metrics-lib
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Delete HACKING file.
commit dc9df6642d0581aa9c944d124cae925e6d824a68 Author: iwakeh Date: Mon Dec 4 11:14:31 2017 + Delete HACKING file. The information in HACKING is obsolete and current information is available on the web-site and Metrics wiki pages. --- HACKING | 20 1 file changed, 20 deletions(-) diff --git a/HACKING b/HACKING deleted file mode 100644 index f981750..000 --- a/HACKING +++ /dev/null @@ -1,20 +0,0 @@ -Some notes on code style: - -General: -- Lines do not exceed 74 characters unless things become really ugly. -- Files end with two newlines. - -Java code: -Please refer to the Metrics Team Java Style Guide: -https://trac.torproject.org/projects/tor/wiki/org/teams/MetricsTeam/MetricsJavaStyleGuide#CodingStyle - - -SQL code: -- All SQL keywords and PostgreSQL functions are written in capital - letters. -- Never execute a query with SELECT * and expect the result columns to be - in a specific order. - -R: -- Add a space before and after '='. - ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Add ant task for onionperf module.
commit 5b61e9c40a655e2083b34c37f95a5ac9914277a0 Author: iwakeh Date: Mon Dec 4 11:14:23 2017 + Add ant task for onionperf module. Move sources to main src folder, delete old build.xml and shell script; create ant task for running onionperf. --- build.xml | 5 + modules/onionperf/.gitignore | 2 -- modules/onionperf/build.xml | 19 --- shared/bin/40-run-onionperf-stats.sh | 5 - .../java/org/torproject/metrics/onionperf/Main.java | 0 .../main/sql/onionperf}/init-onionperf.sql| 0 6 files changed, 5 insertions(+), 26 deletions(-) diff --git a/build.xml b/build.xml index 0ed97ba..a120461 100644 --- a/build.xml +++ b/build.xml @@ -91,6 +91,11 @@ + + + + + - - - - - - - - - - - - - - - - - - diff --git a/shared/bin/40-run-onionperf-stats.sh b/shared/bin/40-run-onionperf-stats.sh deleted file mode 100755 index 6f025e7..000 --- a/shared/bin/40-run-onionperf-stats.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -cd modules/onionperf/ -ant | grep "\[java\]" | grep -Ev " DEBUG | INFO " -cd ../../ - diff --git a/modules/onionperf/src/main/java/org/torproject/metrics/onionperf/Main.java b/src/main/java/org/torproject/metrics/onionperf/Main.java similarity index 100% rename from modules/onionperf/src/main/java/org/torproject/metrics/onionperf/Main.java rename to src/main/java/org/torproject/metrics/onionperf/Main.java diff --git a/modules/onionperf/src/main/resources/init-onionperf.sql b/src/main/sql/onionperf/init-onionperf.sql similarity index 100% rename from modules/onionperf/src/main/resources/init-onionperf.sql rename to src/main/sql/onionperf/init-onionperf.sql ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Add main build.xml based on metrics-base.
commit 7fe0316a6be7a758db09610034a18190207279be Author: iwakeh Date: Mon Dec 4 11:14:13 2017 + Add main build.xml based on metrics-base. Only some library patternsets are added, no tasks yet. --- build.xml | 73 +++ 1 file changed, 73 insertions(+) diff --git a/build.xml b/build.xml new file mode 100644 index 000..26bbf0e --- /dev/null +++ b/build.xml @@ -0,0 +1,73 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + &base; + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Add ant task for advbwdist run.
commit 6056b8c800f5a01d3f79514e7e8e1ba62b379179
Author: iwakeh
Date: Mon Dec 4 11:14:25 2017 +
Add ant task for advbwdist run.
Move related sources to main src tree,
delete old build.xml and shell script;
add ant helper task for running R scripts.
---
build.xml | 21 +
modules/advbwdist/.gitignore| 4
modules/advbwdist/build.xml | 11 ---
shared/bin/60-run-advbwdist-stats.sh| 6 --
{modules => src/main/R}/advbwdist/aggregate.R | 0
.../java/org/torproject/metrics/advbwdist/Main.java | 0
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/build.xml b/build.xml
index 51596b6..3095512 100644
--- a/build.xml
+++ b/build.xml
@@ -96,6 +96,14 @@
+
+
+
+
+
+
+
+
@@ -138,6 +146,19 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/advbwdist/.gitignore b/modules/advbwdist/.gitignore
deleted file mode 100644
index 4bb76a5..000
--- a/modules/advbwdist/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-classes/
-stats/
-status/
-
diff --git a/modules/advbwdist/build.xml b/modules/advbwdist/build.xml
deleted file mode 100644
index 9a95bbf..000
--- a/modules/advbwdist/build.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/shared/bin/60-run-advbwdist-stats.sh
b/shared/bin/60-run-advbwdist-stats.sh
deleted file mode 100755
index a06e848..000
--- a/shared/bin/60-run-advbwdist-stats.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-cd modules/advbwdist/
-ant | grep "\[java\]"
-R --slave -f aggregate.R
-cd ../../
-
diff --git a/modules/advbwdist/aggregate.R b/src/main/R/advbwdist/aggregate.R
similarity index 100%
rename from modules/advbwdist/aggregate.R
rename to src/main/R/advbwdist/aggregate.R
diff --git
a/modules/advbwdist/src/main/java/org/torproject/metrics/advbwdist/Main.java
b/src/main/java/org/torproject/metrics/advbwdist/Main.java
similarity index 100%
rename from
modules/advbwdist/src/main/java/org/torproject/metrics/advbwdist/Main.java
rename to src/main/java/org/torproject/metrics/advbwdist/Main.java
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Add ant task for hidserv module.
commit a990b80149160cc187e4581b9c81586021cfcf51 Author: iwakeh Date: Mon Dec 4 11:14:24 2017 + Add ant task for hidserv module. Move sources to main src folder, delete old build.xml and shell script; create ant task for running hidserv. --- build.xml | 5 + modules/hidserv/.gitignore| 4 modules/hidserv/build.xml | 11 --- shared/bin/70-run-hidserv-stats.sh| 5 - .../main/java/org/torproject/metrics/hidserv/Aggregator.java | 0 .../torproject/metrics/hidserv/ComputedNetworkFractions.java | 0 .../java/org/torproject/metrics/hidserv/DateTimeHelper.java | 0 .../main/java/org/torproject/metrics/hidserv/Document.java| 0 .../java/org/torproject/metrics/hidserv/DocumentStore.java| 0 .../torproject/metrics/hidserv/ExtrapolatedHidServStats.java | 0 .../java/org/torproject/metrics/hidserv/Extrapolator.java | 0 .../main/java/org/torproject/metrics/hidserv/Main.java| 0 .../main/java/org/torproject/metrics/hidserv/Parser.java | 0 .../org/torproject/metrics/hidserv/ReportedHidServStats.java | 0 .../main/java/org/torproject/metrics/hidserv/Simulate.java| 0 15 files changed, 5 insertions(+), 20 deletions(-) diff --git a/build.xml b/build.xml index a120461..51596b6 100644 --- a/build.xml +++ b/build.xml @@ -96,6 +96,11 @@ + + + + + - - - - - - - - - - diff --git a/shared/bin/70-run-hidserv-stats.sh b/shared/bin/70-run-hidserv-stats.sh deleted file mode 100755 index a924f31..000 --- a/shared/bin/70-run-hidserv-stats.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -cd modules/hidserv/ -ant | grep "\[java\]" -cd ../../ - diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Aggregator.java b/src/main/java/org/torproject/metrics/hidserv/Aggregator.java similarity index 100% rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Aggregator.java rename to src/main/java/org/torproject/metrics/hidserv/Aggregator.java diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java b/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java similarity index 100% rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java rename to src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java b/src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java similarity index 100% rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java rename to src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Document.java b/src/main/java/org/torproject/metrics/hidserv/Document.java similarity index 100% rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Document.java rename to src/main/java/org/torproject/metrics/hidserv/Document.java diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java b/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java similarity index 100% rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java rename to src/main/java/org/torproject/metrics/hidserv/DocumentStore.java diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java b/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java similarity index 100% rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java rename to src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Extrapolator.java b/src/main/java/org/torproject/metrics/hidserv/Extrapolator.java similarity index 100% rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Extrapolator.java rename to src/main/java/org/torproject/metrics/hidserv/Extrapolator.java diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Main.java b/src/main/java/org/torproject/metrics/hidserv/Main.java similarity index 100% rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Main.java rename to src/main/java/org/torproject/metrics/hidserv/Main.java diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Parser.java b/src/main/java/org/torproject/metrics/hidserv/Parser.java similarity index 100% rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Parser.java rename to src/main/java/org/torproject/metrics/hidserv/Parser.java diff --git a/module
[tor-commits] [metrics-web/master] Add ant task for webstats run.
commit 71843789443755a4a62b519543adc1d83eb5792c Author: iwakeh Date: Mon Dec 4 11:14:26 2017 + Add ant task for webstats run. Move related sources to main src tree, delete old build.xml and shell script. --- build.xml| 11 +++ modules/webstats/.gitignore | 3 --- modules/webstats/build.xml | 20 shared/bin/90-run-webstats-stats.sh | 10 -- .../resources => src/main/R/webstats}/write-RData.R | 0 .../java/org/torproject/metrics/webstats/Main.java | 0 .../main/sql/webstats}/init-webstats.sql | 0 .../org/torproject/metrics/webstats/MainTest.java| 0 8 files changed, 11 insertions(+), 33 deletions(-) diff --git a/build.xml b/build.xml index 3095512..b793a10 100644 --- a/build.xml +++ b/build.xml @@ -109,6 +109,17 @@ + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - diff --git a/shared/bin/90-run-webstats-stats.sh b/shared/bin/90-run-webstats-stats.sh deleted file mode 100755 index 37091b4..000 --- a/shared/bin/90-run-webstats-stats.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -cd modules/webstats/ - -ant run | grep "\[java\]" - -R --slave -f src/main/resources/write-RData.R > /dev/null 2>&1 - -cd ../../ - diff --git a/modules/webstats/src/main/resources/write-RData.R b/src/main/R/webstats/write-RData.R similarity index 100% rename from modules/webstats/src/main/resources/write-RData.R rename to src/main/R/webstats/write-RData.R diff --git a/modules/webstats/src/main/java/org/torproject/metrics/webstats/Main.java b/src/main/java/org/torproject/metrics/webstats/Main.java similarity index 100% rename from modules/webstats/src/main/java/org/torproject/metrics/webstats/Main.java rename to src/main/java/org/torproject/metrics/webstats/Main.java diff --git a/modules/webstats/src/main/resources/init-webstats.sql b/src/main/sql/webstats/init-webstats.sql similarity index 100% rename from modules/webstats/src/main/resources/init-webstats.sql rename to src/main/sql/webstats/init-webstats.sql diff --git a/modules/webstats/src/test/java/org/torproject/metrics/webstats/MainTest.java b/src/test/java/org/torproject/metrics/webstats/MainTest.java similarity index 100% rename from modules/webstats/src/test/java/org/torproject/metrics/webstats/MainTest.java rename to src/test/java/org/torproject/metrics/webstats/MainTest.java ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Create ant task for running connbidirect module.
commit 478f35413065bf1f6b32a2bafcbe654099c1e6d1 Author: iwakeh Date: Mon Dec 4 11:14:21 2017 + Create ant task for running connbidirect module. Move the sources and test sources. Delete old script and build.xml. Create task connbidirect. --- build.xml | 7 ++- modules/connbidirect/.gitignore | 3 --- modules/connbidirect/build.xml | 13 - shared/bin/10-run-connbidirect-stats.sh | 5 - .../main/java/org/torproject/metrics/connbidirect/Main.java | 0 .../java/org/torproject/metrics/connbidirect/MainTest.java | 0 6 files changed, 6 insertions(+), 22 deletions(-) diff --git a/build.xml b/build.xml index 7f2abe9..0ed97ba 100644 --- a/build.xml +++ b/build.xml @@ -86,6 +86,11 @@ + + + + + - + diff --git a/modules/connbidirect/.gitignore b/modules/connbidirect/.gitignore deleted file mode 100644 index b359b59..000 --- a/modules/connbidirect/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -classes/ -stats/ - diff --git a/modules/connbidirect/build.xml b/modules/connbidirect/build.xml deleted file mode 100644 index 4c9c1f4..000 --- a/modules/connbidirect/build.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/shared/bin/10-run-connbidirect-stats.sh b/shared/bin/10-run-connbidirect-stats.sh deleted file mode 100755 index d59c315..000 --- a/shared/bin/10-run-connbidirect-stats.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -cd modules/connbidirect/ -ant | grep "\[java\]" -cd ../../ - diff --git a/modules/connbidirect/src/main/java/org/torproject/metrics/connbidirect/Main.java b/src/main/java/org/torproject/metrics/connbidirect/Main.java similarity index 100% rename from modules/connbidirect/src/main/java/org/torproject/metrics/connbidirect/Main.java rename to src/main/java/org/torproject/metrics/connbidirect/Main.java diff --git a/modules/connbidirect/src/test/java/org/torproject/metrics/connbidirect/MainTest.java b/src/test/java/org/torproject/metrics/connbidirect/MainTest.java similarity index 100% rename from modules/connbidirect/src/test/java/org/torproject/metrics/connbidirect/MainTest.java rename to src/test/java/org/torproject/metrics/connbidirect/MainTest.java ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Replace web-prepare.sh by ant task.
commit 5523617d54cc31acec49947184daa9334cdded31 Author: iwakeh Date: Mon Dec 4 11:14:14 2017 + Replace web-prepare.sh by ant task. This is a preparational move. The ant task will later be called from the task preparing the war, i.e., it is only an internal helper task. --- build.xml | 10 ++ website/src/main/resources/web-prepare.sh | 15 --- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/build.xml b/build.xml index 26bbf0e..bef7e1b 100644 --- a/build.xml +++ b/build.xml @@ -64,6 +64,16 @@ + + + + + + + + diff --git a/website/src/main/resources/web-prepare.sh b/website/src/main/resources/web-prepare.sh deleted file mode 100755 index 02b604b..000 --- a/website/src/main/resources/web-prepare.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# Expecting the submodule path as argument -# - -cd $1 - -for x in metrics-lib ; do -cd $1/$x -src/main/resources/bootstrap-development.sh -if ! [ -d lib ] ; then -mkdir lib -fi; -ant clean docs -done; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Delete CONTRIB.md.
commit 294a6d097505e0d254ee7019d553b89a41643645 Author: iwakeh Date: Mon Dec 4 11:14:30 2017 + Delete CONTRIB.md. CONTRIB.md is partially obsolete and the information it contains is already available on the public web-pages. --- CONTRIB.md | 89 -- 1 file changed, 89 deletions(-) diff --git a/CONTRIB.md b/CONTRIB.md deleted file mode 100644 index 4f36afe..000 --- a/CONTRIB.md +++ /dev/null @@ -1,89 +0,0 @@ -Contributor's guide to the Metrics website - -Dear contributor to the Metrics website. This guide shall help you -understand the design decisions behind building the Metrics website and -give you starting points where you should look to make it bigger and -better. - -First of all, let's talk briefly about the scope of the Metrics website, -which we'll be calling Metrics in the following. - - - What Metrics is: Metrics is supposed to provide easy access to Tor - network data. The typical Metrics user is neither a researcher nor a - developer and is just looking for an easy way to learn more about this - Tor network they have been hearing about. Metrics is giving them data - in visual or tabular form, together with explanations that are easy to - understand with as little technical language as possible. - - - What Metrics is not: The typical Tor researcher or Tor developer would - probably want to dive deeper into the data to learn even more about the - Tor network. But in contrast to the average Metrics user they could - just fetch the original data from CollecTor and run their own analysis. - Metrics is not trying to be the solution for everyone. If we have to - choose, we're aiming for simplicity instead of comprehensiveness. - -Now let's take a quick tour of the components that Metrics is made of. - - - Data-processing modules: The bulk of Metrics code is running in the - background, invisible to Metrics users. It's the code that takes - CollecTor data as input and that produces .csv files that are the basis - for graphs and tables on Metrics. There's usually one such module per - generated .csv file that focuses on a different aspect of Tor network - data. All these modules are periodically executed by the system's cron - daemon, independent of user requests to the website part of Metrics. - See the modules/ subdirectory for the existing data-processing modules. - Note that modules don't have to be written in Java even though that's - currently the case for all of them. The only requirement is that - there's a shell script to run the module using packages available in - Debian stable. The remaining components of Metrics are all related to - its website part. - - - Start page: The website part of Metrics is organized into one page per - metric, which can be a graph, table, data file, or external link, and - the start page to browse available metrics. Each metric has attributes - like a descriptive name, one or more tags (relays, bridges, etc.), a - type (graph, table, etc.), and a level (basic or advanced). All - metrics are defined in `website/etc/metrics.json` and displayed in the - table on the start page. - - - Graph pages: The bulk of graph pages consist of graphing methods in - `website/rserve/graphs.R` that are written in R and using the ggplot2 - graphing library. These methods read one or more of the .csv files - produced by data-processing modules and produce a graph image as - output. Graphs have a few additional attributes in - `website/etc/metrics.json` like a description and parameters to - customize the graph. As of writing this guide, there's one exception - with the bubble graph which is implemented using JavaScript library - D3.js and which might soon be generated on the server using Node.js. - - - Table pages: Metrics also provides a few aspects of Tor network data in - tabular form with customization options. Like graphs, the data in - these tables is provided using R by reading the previously generated - .csv files. All relevant R code for generating table data is located - in `website/rserve/tables.R`. Again, there are additional attributes - in `website/etc/metrics.json` that define what parameters are available - to customize table contents and how to format results. - - - Data pages: While most Metrics user are not expected to run their own - analyses based on raw Tor network data, some of them might want to look - deeper into the data they saw in a graph or table. Metrics provides - all pre-aggregated output from its data-processing modules as - downloadable .csv files and also documents these file formats in - sufficient detail for Metrics users to use them. - - - Link pages: Metrics is not the only game in town, and it's great that - other developers take the publicly available Tor network data and - visualize it in a different way. Metrics acknowledges these efforts b
[tor-commits] [metrics-web/master] Replace start script for Rserver by ant script.
commit ba8e25e19a77d53b82582f2a7f2b1025b4c011f7
Author: iwakeh
Date: Mon Dec 4 11:14:17 2017 +
Replace start script for Rserver by ant script.
This includes moving the necessary R sources and config file to a location
in the main source tree and removing the now obsolete script.
---
build.xml| 14 ++
{website/rserve => src/main/R/rserver}/Rserv.conf| 0
{website/rserve => src/main/R/rserver}/graphs.R | 0
{website/rserve => src/main/R/rserver}/rserve-init.R | 0
{website/rserve => src/main/R/rserver}/tables.R | 0
website/rserve/start.sh | 3 ---
6 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index bef7e1b..7ebe764 100644
--- a/build.xml
+++ b/build.xml
@@ -74,6 +74,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/website/rserve/Rserv.conf b/src/main/R/rserver/Rserv.conf
similarity index 100%
rename from website/rserve/Rserv.conf
rename to src/main/R/rserver/Rserv.conf
diff --git a/website/rserve/graphs.R b/src/main/R/rserver/graphs.R
similarity index 100%
rename from website/rserve/graphs.R
rename to src/main/R/rserver/graphs.R
diff --git a/website/rserve/rserve-init.R b/src/main/R/rserver/rserve-init.R
similarity index 100%
rename from website/rserve/rserve-init.R
rename to src/main/R/rserver/rserve-init.R
diff --git a/website/rserve/tables.R b/src/main/R/rserver/tables.R
similarity index 100%
rename from website/rserve/tables.R
rename to src/main/R/rserver/tables.R
diff --git a/website/rserve/start.sh b/website/rserve/start.sh
deleted file mode 100755
index f353885..000
--- a/website/rserve/start.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-dir=`pwd`
-R CMD Rserve --no-save --RS-conf $dir/Rserv.conf >> rserve.log 2>&1
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Replace run-web and copy scripts with ant tasks.
commit 4ea3758cfffa70a63c5721185f4b110d131cc663 Author: iwakeh Date: Mon Dec 4 11:14:29 2017 + Replace run-web and copy scripts with ant tasks. --- build.xml | 32 run-web.sh| 6 -- shared/bin/99-copy-stats-files.sh | 15 --- 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/build.xml b/build.xml index 78f17d0..ed2125a 100644 --- a/build.xml +++ b/build.xml @@ -81,6 +81,19 @@ + + + + + + + + + + + + + @@ -237,6 +250,25 @@ + + + + + + + + + + + + + + + + + + diff --git a/run-web.sh b/run-web.sh deleted file mode 100755 index bd0bb5c..000 --- a/run-web.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -for i in $(ls shared/bin/[0-9]* | sort); do - echo `date` "Running $i." - ./$i -done - diff --git a/shared/bin/99-copy-stats-files.sh b/shared/bin/99-copy-stats-files.sh deleted file mode 100755 index cc0c9fc..000 --- a/shared/bin/99-copy-stats-files.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -mkdir -p shared/stats -cp -a modules/onionperf/stats/*.csv shared/stats/ -cp -a modules/legacy/stats/*.csv shared/stats/ -cp -a modules/connbidirect/stats/connbidirect2.csv shared/stats/ -cp -a modules/advbwdist/stats/advbwdist.csv shared/stats/ -cp -a modules/hidserv/stats/hidserv.csv shared/stats/ -cp -a modules/clients/stats/clients*.csv shared/stats/ -cp -a modules/clients/stats/userstats-combined.csv shared/stats/ -cp -a modules/webstats/stats/webstats.csv shared/stats/ - -mkdir -p shared/RData -cp -a modules/clients/RData/*.RData shared/RData/ -cp -a modules/webstats/RData/*.RData shared/RData/ - ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Raise memory from 2g to 4g for all module runs.
commit 51ea118abe6c416af01125dfdc2265db40f89f86 Author: Karsten Loesing Date: Tue Dec 19 10:27:36 2017 +0100 Raise memory from 2g to 4g for all module runs. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 070ec67..f77048a 100644 --- a/build.xml +++ b/build.xml @@ -388,7 +388,7 @@ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Add ant task for collectdescs run, move related sources.
commit 2d7e8cf4dadfbf100126570f8e2e7066de38c016 Author: iwakeh Date: Mon Dec 4 11:14:20 2017 + Add ant task for collectdescs run, move related sources. Delete old build.xml and shell script; add some deployment related properties to build.xml; add ant helper task for running java modules. --- build.xml | 35 ++ modules/collectdescs/build.xml | 11 --- shared/bin/01-collectdescs.sh | 5 .../org/torproject/metrics/collectdescs/Main.java | 0 4 files changed, 35 insertions(+), 16 deletions(-) diff --git a/build.xml b/build.xml index 7ebe764..7f2abe9 100644 --- a/build.xml +++ b/build.xml @@ -74,7 +74,18 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/collectdescs/build.xml b/modules/collectdescs/build.xml deleted file mode 100644 index 1499df6..000 --- a/modules/collectdescs/build.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/shared/bin/01-collectdescs.sh b/shared/bin/01-collectdescs.sh deleted file mode 100755 index 18b900f..000 --- a/shared/bin/01-collectdescs.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -cd modules/collectdescs/ -ant | grep "\[java\]" -cd ../../ - diff --git a/modules/collectdescs/src/main/java/org/torproject/metrics/collectdescs/Main.java b/src/main/java/org/torproject/metrics/collectdescs/Main.java similarity index 100% rename from modules/collectdescs/src/main/java/org/torproject/metrics/collectdescs/Main.java rename to src/main/java/org/torproject/metrics/collectdescs/Main.java ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Add ant task for legacy run.
commit 9554c558608741ec0bc400744b8d25b82a46f275 Author: iwakeh Date: Mon Dec 4 11:14:27 2017 + Add ant task for legacy run. Move related sources to main src tree, delete old build.xml and shell script. Update .gitignore to ignore legacy.config. The psql executions can contain all command line parameters of psql, i.e., it is also possible to add username and more. Currently, only the db name is set. This situation could be made easier/more consistent, but this is a new task not part of the current. --- .gitignore | 2 +- build.xml | 46 ++ modules/legacy/build.xml | 24 --- shared/bin/50-run-legacy-stats.sh | 9 - .../org/torproject/ernie/cron/Configuration.java | 0 .../java/org/torproject/ernie/cron/LockFile.java | 0 .../ernie/cron/LoggingConfiguration.java | 0 .../main/java/org/torproject/ernie/cron/Main.java | 0 .../cron/RelayDescriptorDatabaseImporter.java | 0 .../cron/network/ConsensusStatsFileHandler.java| 0 .../main/resources/legacy.config.template | 0 .../legacy/db => src/main/sql/legacy}/tordir.sql | 0 12 files changed, 47 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 8234621..b546cef 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ cobertura.ser /lib/ # Copied and possibly modified config file -config +legacy.config # other *~ diff --git a/build.xml b/build.xml index b793a10..09857ba 100644 --- a/build.xml +++ b/build.xml @@ -96,6 +96,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/legacy/build.xml b/modules/legacy/build.xml deleted file mode 100644 index bc2b674..000 --- a/modules/legacy/build.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/shared/bin/50-run-legacy-stats.sh b/shared/bin/50-run-legacy-stats.sh deleted file mode 100755 index 0fd5699..000 --- a/shared/bin/50-run-legacy-stats.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -cd modules/legacy/ -ant | grep "\[java\]" -psql -U metrics tordir -c 'SELECT * FROM refresh_all();' -mkdir -p stats -psql -c 'COPY (SELECT * FROM stats_servers) TO STDOUT WITH CSV HEADER;' tordir > stats/servers.csv -psql -c 'COPY (SELECT * FROM stats_bandwidth) TO STDOUT WITH CSV HEADER;' tordir > stats/bandwidth.csv -cd ../../ - diff --git a/modules/legacy/src/main/java/org/torproject/ernie/cron/Configuration.java b/src/main/java/org/torproject/ernie/cron/Configuration.java similarity index 100% rename from modules/legacy/src/main/java/org/torproject/ernie/cron/Configuration.java rename to src/main/java/org/torproject/ernie/cron/Configuration.java diff --git a/modules/legacy/src/main/java/org/torproject/ernie/cron/LockFile.java b/src/main/java/org/torproject/ernie/cron/LockFile.java similarity index 100% rename from modules/legacy/src/main/java/org/torproject/ernie/cron/LockFile.java rename to src/main/java/org/torproject/ernie/cron/LockFile.java diff --git a/modules/legacy/src/main/java/org/torproject/ernie/cron/LoggingConfiguration.java b/src/main/java/org/torproject/ernie/cron/LoggingConfiguration.java similarity index 100% rename from modules/legacy/src/main/java/org/torproject/ernie/cron/LoggingConfiguration.java rename to src/main/java/org/torproject/ernie/cron/LoggingConfiguration.java diff --git a/modules/legacy/src/main/java/org/torproject/ernie/cron/Main.java b/src/main/java/org/torproject/ernie/cron/Main.java similarity index 100% rename from modules/legacy/src/main/java/org/torproject/ernie/cron/Main.java rename to src/main/java/org/torproject/ernie/cron/Main.java diff --git a/modules/legacy/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java b/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java similarity index 100% rename from modules/legacy/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java rename to src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java diff --git a/modules/legacy/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java b/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java similarity index 100% rename from modules/legacy/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java rename to src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java diff --git a/modules/legacy/config.template b/src/main/resources/legacy.config.template similarity index 100% rename from modules/legacy/config.template rename to src/main/resources/legacy
[tor-commits] [metrics-web/master] Remove obsolete build files.
commit 889083a1fb3edf9ea72ca67b7d9887f43fe402f9 Author: iwakeh Date: Mon Dec 4 11:14:34 2017 + Remove obsolete build files. --- shared/.gitignore | 4 - shared/build-base.xml | 107 - shared/build.xml| 51 - shared/resources/metrics_checks.xml | 221 4 files changed, 383 deletions(-) diff --git a/shared/.gitignore b/shared/.gitignore deleted file mode 100644 index c3e32d5..000 --- a/shared/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/generated/ -/lib/ -/stats/ - diff --git a/shared/build-base.xml b/shared/build-base.xml deleted file mode 100644 index d27757b..000 --- a/shared/build-base.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/shared/build.xml b/shared/build.xml deleted file mode 100644 index 3b0a799..000 --- a/shared/build.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/shared/resources/metrics_checks.xml b/shared/resources/metrics_checks.xml deleted file mode 100644 index 2df2f2a..000 --- a/shared/resources/metrics_checks.xml +++ /dev/null @@ -1,221 +0,0 @@ - -http://www.puppycrawl.com/dtds/configuration_1_3.dtd";> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ftp://"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Add main class for web server using an embedded jetty.
commit 811e621bab4b162e7c9007fb1a1de0f45533720c
Author: iwakeh
Date: Mon Dec 4 11:14:41 2017 +
Add main class for web server using an embedded jetty.
---
.../org/torproject/metrics/web/ServerMain.java | 32 ++
1 file changed, 32 insertions(+)
diff --git a/src/main/java/org/torproject/metrics/web/ServerMain.java
b/src/main/java/org/torproject/metrics/web/ServerMain.java
new file mode 100644
index 000..882ab80
--- /dev/null
+++ b/src/main/java/org/torproject/metrics/web/ServerMain.java
@@ -0,0 +1,32 @@
+/* Copyright 2017 The Tor Project
+ * See LICENSE for licensing information */
+
+package org.torproject.metrics.web;
+
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.xml.XmlConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ServerMain {
+
+ private static final Logger log = LoggerFactory.getLogger(ServerMain.class);
+
+ /** Starts the web server listening for incoming client connections. */
+ public static void main(String[] args) {
+try {
+ Resource jettyXml = Resource.newSystemResource("jetty.xml");
+ log.info("Reading configuration from '{}'.", jettyXml);
+ XmlConfiguration configuration
+ = new XmlConfiguration(jettyXml.getInputStream());
+ Server server = (Server) configuration.configure();
+ server.start();
+ server.join();
+} catch (Exception ex) {
+ log.error("Exiting, because of: {}.", ex.getMessage(), ex);
+ System.exit(1);
+}
+ }
+}
+
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Added default in switch statement.
commit 4cdd00dae29fb17d6a496984e2362639f2fe348e
Author: iwakeh
Date: Mon Dec 18 09:11:59 2017 +
Added default in switch statement.
Avoid checkstyle complaint.
---
src/main/java/org/torproject/metrics/web/GraphServlet.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/org/torproject/metrics/web/GraphServlet.java
b/src/main/java/org/torproject/metrics/web/GraphServlet.java
index 02f1cee..7df5294 100644
--- a/src/main/java/org/torproject/metrics/web/GraphServlet.java
+++ b/src/main/java/org/torproject/metrics/web/GraphServlet.java
@@ -241,6 +241,7 @@ public class GraphServlet extends MetricServlet {
case "events":
eventsParameter = checkedParameter.getValue()[0];
break;
+ default: // don't care about other parameters
}
}
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Move doc folder into main src tree.
commit 6c2679ec1797976e171a68bbd3d7442a34f0a5d1
Author: iwakeh
Date: Mon Dec 4 11:14:33 2017 +
Move doc folder into main src tree.
Delete stats-spec.txt as the information therein is not very useful.
users-q-and-a.txt should either become part of the web-pages or the future
README document.
---
doc/stats-spec.txt| 14 --
{doc => src/main/resources/doc}/users-q-and-a.txt | 0
website/src/main/resources/etc/metrics.json | 16
3 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/doc/stats-spec.txt b/doc/stats-spec.txt
deleted file mode 100644
index 85bb78e..000
--- a/doc/stats-spec.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Statistics produced by Tor Metrics
-==
-
-Tor Metrics aggregates large amounts of Tor network data and visualizes
-results in customizable graphs and tables. All aggregated data are also
-available for download, so that people can easily plot their own graphs or
-even develop a prettier metrics website without writing their own data
-aggregation code.
-
-Statistics files and data formats are available at:
-
- https://metrics.torproject.org/
-
-
diff --git a/doc/users-q-and-a.txt b/src/main/resources/doc/users-q-and-a.txt
similarity index 100%
rename from doc/users-q-and-a.txt
rename to src/main/resources/doc/users-q-and-a.txt
diff --git a/website/src/main/resources/etc/metrics.json
b/website/src/main/resources/etc/metrics.json
index a3a4918..1320f6c 100644
--- a/website/src/main/resources/etc/metrics.json
+++ b/website/src/main/resources/etc/metrics.json
@@ -151,7 +151,7 @@
"id": "userstats-relay-country",
"title": "Relay users",
"type": "Graph",
-"description": "This graph shows the estimated number of
directly-connecting clients; that is, it
excludes clients connecting via bridges.
These estimates are derived from the number of directory requests counted on directory authorities and mirrors. Relays resolve client IP
addresses to country codes, so that graphs are available for most countries.
Furthermore, it is possible to display indications of censorship events as
obtained from an anomaly-based censorship-detection system (for more details,
see this https://research.torproject.org/techreports/detector-2011-09-09.pdf\";>technical
report). For further details see these https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\";>questions
and answers about user statistics.",
+"description": "This graph shows the estimated number of
directly-connecting clients; that is, it
excludes clients connecting via bridges.
These estimates are derived from the number of directory requests counted on directory authorities and mirrors. Relays resolve client IP
addresses to country codes, so that graphs are available for most countries.
Furthermore, it is possible to display indications of censorship events as
obtained from an anomaly-based censorship-detection system (for more details,
see this https://research.torproject.org/techreports/detector-2011-09-09.pdf\";>technical
report). For further details see these https://gitweb.torproject.org/metrics-web.git/tree/src/main/resources/doc/users-q-and-a.txt\";>questions
and answers about user statistics.",
"function": "plot_userstats_relay_country",
"parameters": [
"start",
@@ -168,7 +168,7 @@
"id": "userstats-relay-table",
"title": "Top-10 countries by relay users",
"type": "Table",
-"description": "This table shows the top-10 countries by estimated
number of directly-connecting clients.
These numbers are derived from directory requests counted on directory authorities and mirrors. Relays resolve client IP
addresses to country codes, so that numbers are available for most countries.
For further details see these https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\";>questions
and answers about user statistics.",
+"description": "This table shows the top-10 countries by estimated
number of directly-connecting clients.
These numbers are derived from directory requests counted on directory authorities and mirrors. Relays resolve client IP
addresses to country codes, so that numbers are available for most countries.
For further details see these https://gitweb.torproject.org/metrics-web.git/tree/src/main/resources/doc/users-q-and-a.txt\";>questions
and answers about user statistics.",
"function": "write_userstats_relay",
"parameters": [
"start",
@@ -190,7 +190,7 @@
"id": "userstats-censorship-events",
"title": "Top-10 countries by possible censorship events",
"type": "Table",
-"description": "This table shows the top-10 countries by possible
censorship events, as obtained from an anomaly-based censorship-detection
system (for more details, see this https://research.torproject.org/techreports/detector-2011-09-09.pdf\";>technical
report). For fur
[tor-commits] [metrics-web/master] Remove catch for exception that is not thrown.
commit cc979dae8b17f864dd3d720b5fc7aae15c681b5f
Author: iwakeh
Date: Mon Dec 4 11:14:38 2017 +
Remove catch for exception that is not thrown.
---
.../java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
b/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
index 026707b..36f2102 100644
---
a/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
+++
b/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
@@ -386,7 +386,7 @@ public final class RelayDescriptorDatabaseImporter {
+ (ports != null ? ports : "\\N") + "\t");
this.statusentryOut.write(PGbytea.toPGString(rawDescriptor)
.replaceAll("", "") + "\n");
- } catch (SQLException | IOException e) {
+ } catch (IOException e) {
this.logger.log(Level.WARNING, "Could not write network status "
+ "consensus entry to raw database import file. We won't "
+ "make any further attempts to write raw import files in "
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Ensure that java runs don't depend on server locale.
commit 65f9c6de3565613b3620e410c713f0f429d7ee48 Author: iwakeh Date: Mon Dec 4 11:14:51 2017 + Ensure that java runs don't depend on server locale. As in commit 32b0a83 this leads to problems in locales not using a decimal dot. --- build.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.xml b/build.xml index fbfa111..eaf8a3d 100644 --- a/build.xml +++ b/build.xml @@ -394,6 +394,8 @@ + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Add outdated-warning to README.
commit 0aed44785b053a2847a573aabe438fd745c58ae9 Author: iwakeh Date: Mon Dec 4 11:14:32 2017 + Add outdated-warning to README. The update of the build information is part of a different ticket. --- README | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README b/README index 1bd3d8f..bebcd67 100644 --- a/README +++ b/README @@ -1,3 +1,5 @@ +This file contains outdated information and will be updated soon! + Tor Metrics === ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Remove checkstyle complaints.
commit 44d17331863fa1163accf0f4043e642847b6863c
Author: iwakeh
Date: Mon Dec 4 11:14:37 2017 +
Remove checkstyle complaints.
---
src/main/java/org/torproject/metrics/connbidirect/Main.java | 3 ++-
src/main/java/org/torproject/metrics/onionperf/Main.java| 3 ++-
.../java/org/torproject/metrics/web/CollectorDirectoryProvider.java | 6 --
src/test/java/org/torproject/metrics/web/DirectoryListingTest.java | 5 -
4 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/torproject/metrics/connbidirect/Main.java
b/src/main/java/org/torproject/metrics/connbidirect/Main.java
index 1624fa9..6e23ea7 100644
--- a/src/main/java/org/torproject/metrics/connbidirect/Main.java
+++ b/src/main/java/org/torproject/metrics/connbidirect/Main.java
@@ -429,7 +429,8 @@ public class Main {
SortedSet rawStats) {
DateFormat dateFormat = new SimpleDateFormat("-MM-dd");
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-SortedMap> fractionsByDateAndDirection = new
TreeMap<>();
+SortedMap> fractionsByDateAndDirection
+= new TreeMap<>();
final String[] directions = new String[] { "read", "write", "both" };
for (RawStat rawStat : rawStats) {
if (rawStat.fingerprint != null) {
diff --git a/src/main/java/org/torproject/metrics/onionperf/Main.java
b/src/main/java/org/torproject/metrics/onionperf/Main.java
index 04c5dd5..f77b85d 100644
--- a/src/main/java/org/torproject/metrics/onionperf/Main.java
+++ b/src/main/java/org/torproject/metrics/onionperf/Main.java
@@ -233,7 +233,8 @@ public class Main {
SortedSet statistics) throws IOException {
webstatsPath.toFile().getParentFile().mkdirs();
List lines = new ArrayList<>();
-
lines.add("date,filesize,source,server,q1,md,q3,timeouts,failures,requests");
+lines
+
.add("date,filesize,source,server,q1,md,q3,timeouts,failures,requests");
lines.addAll(statistics);
log.info("Writing {} lines to {}.", lines.size(),
webstatsPath.toFile().getAbsolutePath());
diff --git
a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java
b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java
index 9cd1e1e..ca0e0af 100644
--- a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java
+++ b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java
@@ -3,16 +3,10 @@
package org.torproject.metrics.web;
-import org.torproject.descriptor.index.DirectoryNode;
-import org.torproject.descriptor.index.FileNode;
import org.torproject.descriptor.index.IndexNode;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.SortedSet;
-import java.util.TreeSet;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java
b/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java
index 5c6b37a..509785e 100644
--- a/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java
+++ b/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java
@@ -11,12 +11,7 @@ import org.torproject.descriptor.index.IndexNode;
import org.junit.Test;
import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
public class DirectoryListingTest {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Move web content and files to main src folder.
commit 338be5c1d24b4739c7fafa9870dc63bdda0ffe84 Author: iwakeh Date: Mon Dec 4 11:14:43 2017 + Move web content and files to main src folder. --- .../etc => src/main/resources}/context.xml | 0 src/main/resources/jetty.xml | 74 +++ src/main/resources/logback.xml | 58 +++ .../src => src}/main/resources/spec/README.txt | 0 .../main/resources/spec/bridge-descriptors.xml | 0 .../src => src}/main/resources/spec/convert.awk| 0 .../src => src}/main/resources/spec/convert.sh | 0 .../main/resources/spec/rfc2629-other.ent | 0 .../main/resources/spec/rfc2629-xhtml.ent | 0 .../src => src}/main/resources/spec/rfc2629.dtd| 0 .../src => src}/main/resources/spec/rfc2629.xslt | 0 .../main/resources/spec/web-server-logs.xml| 0 .../resources/etc => src/main/resources}/web.xml | 40 +-- .../main/resources/web/css/bootstrap.min.css | 0 .../main/resources/web/css/font-awesome.min.css| 0 .../src => src}/main/resources/web/css/prism.css | 0 .../src => src}/main/resources/web/css/style.css | 0 .../web/fonts/EOT/SourceSansPro-Black.eot | Bin .../web/fonts/EOT/SourceSansPro-BlackIt.eot| Bin .../resources/web/fonts/EOT/SourceSansPro-Bold.eot | Bin .../web/fonts/EOT/SourceSansPro-BoldIt.eot | Bin .../web/fonts/EOT/SourceSansPro-ExtraLight.eot | Bin .../web/fonts/EOT/SourceSansPro-ExtraLightIt.eot | Bin .../resources/web/fonts/EOT/SourceSansPro-It.eot | Bin .../web/fonts/EOT/SourceSansPro-Light.eot | Bin .../web/fonts/EOT/SourceSansPro-LightIt.eot| Bin .../web/fonts/EOT/SourceSansPro-Regular.eot| Bin .../web/fonts/EOT/SourceSansPro-Semibold.eot | Bin .../web/fonts/EOT/SourceSansPro-SemiboldIt.eot | Bin .../main/resources/web/fonts/FontAwesome.otf | Bin .../web/fonts/OTF/SourceSansPro-Black.otf | Bin .../web/fonts/OTF/SourceSansPro-BlackIt.otf| Bin .../resources/web/fonts/OTF/SourceSansPro-Bold.otf | Bin .../web/fonts/OTF/SourceSansPro-BoldIt.otf | Bin .../web/fonts/OTF/SourceSansPro-ExtraLight.otf | Bin .../web/fonts/OTF/SourceSansPro-ExtraLightIt.otf | Bin .../resources/web/fonts/OTF/SourceSansPro-It.otf | Bin .../web/fonts/OTF/SourceSansPro-Light.otf | Bin .../web/fonts/OTF/SourceSansPro-LightIt.otf| Bin .../web/fonts/OTF/SourceSansPro-Regular.otf| Bin .../web/fonts/OTF/SourceSansPro-Semibold.otf | Bin .../web/fonts/OTF/SourceSansPro-SemiboldIt.otf | Bin .../web/fonts/TTF/SourceSansPro-Black.ttf | Bin .../web/fonts/TTF/SourceSansPro-BlackIt.ttf| Bin .../resources/web/fonts/TTF/SourceSansPro-Bold.ttf | Bin .../web/fonts/TTF/SourceSansPro-BoldIt.ttf | Bin .../web/fonts/TTF/SourceSansPro-ExtraLight.ttf | Bin .../web/fonts/TTF/SourceSansPro-ExtraLightIt.ttf | Bin .../resources/web/fonts/TTF/SourceSansPro-It.ttf | Bin .../web/fonts/TTF/SourceSansPro-Light.ttf | Bin .../web/fonts/TTF/SourceSansPro-LightIt.ttf| Bin .../web/fonts/TTF/SourceSansPro-Regular.ttf| Bin .../web/fonts/TTF/SourceSansPro-Semibold.ttf | Bin .../web/fonts/TTF/SourceSansPro-SemiboldIt.ttf | Bin .../fonts/WOFF/OTF/SourceSansPro-Black.otf.woff| Bin .../fonts/WOFF/OTF/SourceSansPro-BlackIt.otf.woff | Bin .../web/fonts/WOFF/OTF/SourceSansPro-Bold.otf.woff | Bin .../fonts/WOFF/OTF/SourceSansPro-BoldIt.otf.woff | Bin .../WOFF/OTF/SourceSansPro-ExtraLight.otf.woff | Bin .../WOFF/OTF/SourceSansPro-ExtraLightIt.otf.woff | Bin .../web/fonts/WOFF/OTF/SourceSansPro-It.otf.woff | Bin .../fonts/WOFF/OTF/SourceSansPro-Light.otf.woff| Bin .../fonts/WOFF/OTF/SourceSansPro-LightIt.otf.woff | Bin .../fonts/WOFF/OTF/SourceSansPro-Regular.otf.woff | Bin .../fonts/WOFF/OTF/SourceSansPro-Semibold.otf.woff | Bin .../WOFF/OTF/SourceSansPro-SemiboldIt.otf.woff | Bin .../fonts/WOFF/TTF/SourceSansPro-Black.ttf.woff| Bin .../fonts/WOFF/TTF/SourceSansPro-BlackIt.ttf.woff | Bin .../web/fonts/WOFF/TTF/SourceSansPro-Bold.ttf.woff | Bin .../fonts/WOFF/TTF/SourceSansPro-BoldIt.ttf.woff | Bin .../WOFF/TTF/SourceSansPro-ExtraLight.ttf.woff | Bin .../WOFF/TTF/SourceSansPro-ExtraLightIt.ttf.woff | Bin .../web/fonts/WOFF/TTF/SourceSansPro-It.ttf.woff | Bin .../fonts/WOFF/TTF/SourceSansPro-Light.ttf.woff| Bin .../fonts/WOFF/TTF/SourceSansPro-LightIt.ttf.woff | Bin .../fonts/WOFF/TTF/SourceSansPro-Regular.ttf.woff | Bin .../fonts/WOFF/TTF/SourceSansPro-Semibold.ttf.woff | Bin .../WOFF/TTF/SourceSansPro-SemiboldIt.ttf.woff | Bin .../fonts/WOFF2/OTF/SourceSansPro-Black.otf.woff2 | Bin .../WOFF2/OTF/SourceSansPro-BlackIt.otf.woff2 | Bin .../fonts/WOFF2/OTF/SourceSansPro-Bold.otf.woff2 | Bin .../fonts/WOFF2/OTF/SourceSansPro-BoldIt.otf.woff2 | Bin .../WOFF2/OTF/SourceSansPro-ExtraLig
[tor-commits] [metrics-web/master] Adapt work-directory default to production server setting.
commit 712af40b7f5bacdfc13389c427cec121d6d368c1 Author: iwakeh Date: Mon Dec 18 15:45:03 2017 + Adapt work-directory default to production server setting. --- build.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 941cfc2..070ec67 100644 --- a/build.xml +++ b/build.xml @@ -178,8 +178,9 @@ - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Adapt paths to new inner war resource locations.
commit 740d170c7712ec9853638c600239c42d7b0f1092
Author: iwakeh
Date: Mon Dec 4 11:14:42 2017 +
Adapt paths to new inner war resource locations.
---
src/main/java/org/torproject/metrics/web/ContentProvider.java | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/torproject/metrics/web/ContentProvider.java
b/src/main/java/org/torproject/metrics/web/ContentProvider.java
index f31c3d0..4f3a5ad 100644
--- a/src/main/java/org/torproject/metrics/web/ContentProvider.java
+++ b/src/main/java/org/torproject/metrics/web/ContentProvider.java
@@ -28,14 +28,15 @@ public class ContentProvider {
private ContentProvider() {
Gson gson = new GsonBuilder().create();
this.metricsList = Arrays.asList(gson.fromJson(new InputStreamReader(
-this.getClass().getClassLoader().getResourceAsStream("metrics.json")),
+this.getClass().getClassLoader()
+.getResourceAsStream("WEB-INF/json/metrics.json")),
Metric[].class));
this.categoriesList = Arrays.asList(gson.fromJson(new InputStreamReader(
this.getClass().getClassLoader().getResourceAsStream(
-"categories.json")), Category[].class));
+"WEB-INF/json/categories.json")), Category[].class));
this.newsList = Arrays.asList(gson.fromJson(new InputStreamReader(
this.getClass().getClassLoader().getResourceAsStream(
-"news.json")), News[].class));
+"WEB-INF/json/news.json")), News[].class));
}
public List getMetricsList() {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Make paths absolute and add concluding echo messages to helper tasks.
commit 940e00cc754f32721c04622081c7a924ba7d402e Author: iwakeh Date: Mon Dec 4 11:14:53 2017 + Make paths absolute and add concluding echo messages to helper tasks. --- build.xml | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index eaf8a3d..941cfc2 100644 --- a/build.xml +++ b/build.xml @@ -322,8 +322,8 @@ - - + + @@ -350,7 +350,7 @@ - + @@ -397,6 +397,7 @@ + @@ -410,6 +411,7 @@ +
[tor-commits] [metrics-web/master] Make DirectoryListing server locale consistent.
commit 34dd60d34394a748143cf0f4dfaf5163fc6c49c3
Author: iwakeh
Date: Mon Dec 4 11:14:44 2017 +
Make DirectoryListing server locale consistent.
Make testFormatBytes pass on servers with a locale not using a decimal dot.
---
src/main/java/org/torproject/metrics/web/DirectoryListing.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/torproject/metrics/web/DirectoryListing.java
b/src/main/java/org/torproject/metrics/web/DirectoryListing.java
index 6dd09e4..b83cedb 100644
--- a/src/main/java/org/torproject/metrics/web/DirectoryListing.java
+++ b/src/main/java/org/torproject/metrics/web/DirectoryListing.java
@@ -10,6 +10,7 @@ import org.torproject.descriptor.index.IndexNode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -84,7 +85,8 @@ public class DirectoryListing extends HashMap>
}
int exp = (int) (Math.log(bytes) / Math.log(1024));
char pre = "KMGTPE".charAt(exp - 1);
-return String.format("%.1f %siB", bytes / Math.pow(1024, exp), pre);
+return String
+.format(Locale.US, "%.1f %siB", bytes / Math.pow(1024, exp), pre);
}
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Use commons-lang3 instead of commons-lang.
commit a5cb73891e6e2d9f9f1b8a8057a97a7372dad8fb Author: iwakeh Date: Mon Dec 4 11:14:39 2017 + Use commons-lang3 instead of commons-lang. --- src/main/java/org/torproject/metrics/web/TableServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/web/TableServlet.java b/src/main/java/org/torproject/metrics/web/TableServlet.java index d8ffbb1..650921a 100644 --- a/src/main/java/org/torproject/metrics/web/TableServlet.java +++ b/src/main/java/org/torproject/metrics/web/TableServlet.java @@ -6,7 +6,7 @@ package org.torproject.metrics.web; import org.torproject.metrics.web.graphs.RObjectGenerator; import org.torproject.metrics.web.graphs.TableParameterChecker; -import org.apache.commons.lang.text.StrSubstitutor; +import org.apache.commons.lang3.text.StrSubstitutor; import java.io.IOException; import java.text.SimpleDateFormat; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Add web classpath patternsets to build.xml.
commit dc5d5706e84f64ccbf67504516c1b3e1461ee179 Author: iwakeh Date: Mon Dec 4 11:14:35 2017 + Add web classpath patternsets to build.xml. --- build.xml | 27 +++ 1 file changed, 27 insertions(+) diff --git a/build.xml b/build.xml index ed2125a..7bab38c 100644 --- a/build.xml +++ b/build.xml @@ -60,8 +60,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Add ant task for war creation.
commit 32003c6e66b6f1169620fa2827360f3fabf0ebd5 Author: iwakeh Date: Mon Dec 4 11:14:36 2017 + Add ant task for war creation. Also move all website related java sources to main src folder. --- build.xml | 77 ++ .../org/torproject/metrics/web/AboutServlet.java | 0 .../org/torproject/metrics/web/AnyServlet.java | 0 .../java/org/torproject/metrics/web/Category.java | 0 .../torproject/metrics/web/CollecTorServlet.java | 0 .../metrics/web/CollectorDirectoryProvider.java| 0 .../torproject/metrics/web/ContentProvider.java| 0 .../torproject/metrics/web/DataSourceServlet.java | 0 .../torproject/metrics/web/DevelopmentServlet.java | 0 .../torproject/metrics/web/DirectoryListing.java | 0 .../org/torproject/metrics/web/ErrorServlet.java | 0 .../torproject/metrics/web/GlossaryServlet.java| 0 .../org/torproject/metrics/web/GraphServlet.java | 0 .../org/torproject/metrics/web/IndexServlet.java | 0 .../org/torproject/metrics/web/LinkServlet.java| 0 .../java/org/torproject/metrics/web/Metric.java| 0 .../org/torproject/metrics/web/MetricServlet.java | 0 .../torproject/metrics/web/MetricsLibServlet.java | 0 .../main/java/org/torproject/metrics/web/News.java | 0 .../org/torproject/metrics/web/NewsServlet.java| 0 .../org/torproject/metrics/web/OnionooServlet.java | 0 .../torproject/metrics/web/OperationServlet.java | 0 .../torproject/metrics/web/ResearchServlet.java| 0 .../torproject/metrics/web/ServicesServlet.java| 0 .../org/torproject/metrics/web/SourcesServlet.java | 0 .../org/torproject/metrics/web/StatsServlet.java | 0 .../org/torproject/metrics/web/TableServlet.java | 0 .../metrics/web/graphs/BubblesServlet.java | 0 .../torproject/metrics/web/graphs/Countries.java | 0 .../metrics/web/graphs/GraphImageServlet.java | 0 .../metrics/web/graphs/GraphParameterChecker.java | 0 .../org/torproject/metrics/web/graphs/RObject.java | 0 .../metrics/web/graphs/RObjectGenerator.java | 0 .../metrics/web/graphs/TableParameterChecker.java | 0 .../metrics/web/research/ResearchStatsServlet.java | 0 .../metrics/web/DirectoryListingTest.java | 0 36 files changed, 77 insertions(+) diff --git a/build.xml b/build.xml index 7bab38c..fbfa111 100644 --- a/build.xml +++ b/build.xml @@ -91,6 +91,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Copy .RData files where they belong.
commit 3b5aadfce19e1f2093e3df819a4bf21952affba9 Author: Karsten Loesing Date: Wed Dec 20 09:57:24 2017 +0100 Copy .RData files where they belong. --- build.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.xml b/build.xml index f77048a..e948388 100644 --- a/build.xml +++ b/build.xml @@ -369,6 +369,8 @@ + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed
commit c6fc8de8bc575aab8ea02d9696f606f78d99cfd3 Author: Translation commit bot Date: Wed Dec 20 09:20:14 2017 + Update translations for tor-messenger-privproperties_completed --- sv/priv.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/priv.properties b/sv/priv.properties index ae9acc871..d14affbfa 100644 --- a/sv/priv.properties +++ b/sv/priv.properties @@ -1,2 +1,2 @@ -priv.account=Skapar privat nyckel +priv.account=Skapar privat nyckel för %S (%S) ... priv.failed=Fel vid skapning av nyckel: %S ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-privproperties] Update translations for tor-messenger-privproperties
commit 1dedbea94e8cd376e8f1e51e8a213db33eb426f6 Author: Translation commit bot Date: Wed Dec 20 09:20:08 2017 + Update translations for tor-messenger-privproperties --- sv/priv.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/priv.properties b/sv/priv.properties index ae9acc871..d14affbfa 100644 --- a/sv/priv.properties +++ b/sv/priv.properties @@ -1,2 +1,2 @@ -priv.account=Skapar privat nyckel +priv.account=Skapar privat nyckel för %S (%S) ... priv.failed=Fel vid skapning av nyckel: %S ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit 0e36b06d74f88430d6557076ed24b9589d06ef3b Author: Translation commit bot Date: Wed Dec 20 09:45:54 2017 + Update translations for https_everywhere_completed --- sv/https-everywhere.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/https-everywhere.properties b/sv/https-everywhere.properties index ad261e36e..9539e82be 100644 --- a/sv/https-everywhere.properties +++ b/sv/https-everywhere.properties @@ -2,7 +2,7 @@ https-everywhere.menu.globalEnable = Aktivera HTTPS Everywhere https-everywhere.menu.globalDisable = Inaktivera HTTPS Everywhere https-everywhere.menu.enableDisable = Aktivera / inaktivera regler https-everywhere.menu.noRules = (Inga regler för denna sida) -https-everywhere.menu.unknownRules = (Regler för denna sida okänt) +https-everywhere.menu.unknownRules = (Regler för denna sida är okänt) https-everywhere.toolbar.hint = HTTPS Everywhere är nu aktiv. Du kan inaktivera den för enstaka sidor genom att klicka på ikonen i adressfältet. https-everywhere.migration.notification0 = För att verkställa en viktig uppdatering kommer dina regelinställningar för HTTPS Everywhere att återställas till sina standardvärden. https-everywhere.menu.ruleset-tests = Kör HTTPS Everywhere regeltester ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit cf5daa4e08d4664b995916b75b5ebbf552a95178 Author: Translation commit bot Date: Wed Dec 20 09:45:41 2017 + Update translations for https_everywhere --- sv/https-everywhere.properties | 2 +- ta/ssl-observatory.dtd | 10 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sv/https-everywhere.properties b/sv/https-everywhere.properties index ad261e36e..9539e82be 100644 --- a/sv/https-everywhere.properties +++ b/sv/https-everywhere.properties @@ -2,7 +2,7 @@ https-everywhere.menu.globalEnable = Aktivera HTTPS Everywhere https-everywhere.menu.globalDisable = Inaktivera HTTPS Everywhere https-everywhere.menu.enableDisable = Aktivera / inaktivera regler https-everywhere.menu.noRules = (Inga regler för denna sida) -https-everywhere.menu.unknownRules = (Regler för denna sida okänt) +https-everywhere.menu.unknownRules = (Regler för denna sida är okänt) https-everywhere.toolbar.hint = HTTPS Everywhere är nu aktiv. Du kan inaktivera den för enstaka sidor genom att klicka pÃ¥ ikonen i adressfältet. https-everywhere.migration.notification0 = För att verkställa en viktig uppdatering kommer dina regelinställningar för HTTPS Everywhere att Ã¥terställas till sina standardvärden. https-everywhere.menu.ruleset-tests = Kör HTTPS Everywhere regeltester diff --git a/ta/ssl-observatory.dtd b/ta/ssl-observatory.dtd index ef8807f28..9013b6cb4 100644 --- a/ta/ssl-observatory.dtd +++ b/ta/ssl-observatory.dtd @@ -53,9 +53,10 @@ to turn it on?">--> +HTTPS à®à®¾à®©à¯à®±à®¿à®¤à®´à¯à®à®³à¯ பிரதிà®à®³à¯ à®à®£à¯à®à®¾à®£à®¿à®ªà¯à®ªà®à®¤à¯à®¤à®¿à®±à¯à®à¯ ஠னà¯à®ªà¯à®ªà®¿, 'நà®à¯à®µà®¿à®²à¯ à®à®³à¯' தாà®à¯à®à¯à®¤à®²à¯à®à®³à¯ à®à®£à¯à®à®±à®¿à®¯ à®à®à¯à®à®³à¯à®à¯à®à¯ à®à®¤à®µà¯à®®à¯ à®®à¯à®²à¯à®®à¯ வலà¯à®¤à®³à®¤à¯à®¤à®¿à®©à¯ பாதà¯à®à®¾à®ªà¯à®ªà¯ à®®à¯à®®à¯à®ªà®à¯à®¤à¯à®¤à¯à®®à¯; மறà¯à®±à¯à®®à¯ (2) +à®à®à¯à®à®³à¯ à®à®²à®¾à®µà®¿à®à¯à®à¯ வரà¯à®®à¯ பாதà¯à®à®¾à®ªà¯à®ªà®±à¯à®± à®à®£à¯à®ªà¯à®ªà¯à®à®³à¯Â ஠லà¯à®²à®¤à¯ தாà®à¯à®à¯à®¤à®²à¯à®à®³à¯à®ªà¯ பறà¯à®±à®¿ நாà®à¯à®à®³à¯ à®à®à¯à®à®³à¯à®à¯à®à¯ à®à®à¯à®à®°à®¿à®à¯à® à®à¯à®à¯à®®à¯."> https://www.something.com, the certificate -received by the Observatory will indicate that somebody visited -www.something.com, but not who visited the site, or what specific page they -looked at. Mouseover the options for further details:"> +"à®à®¤à®¾à®°à®£à®¤à¯à®¤à®¿à®±à¯à®à¯, நà¯à®à¯à®à®³à¯ https://www.something.com à®à¯à®à¯ à®à¯à®©à¯à®±à®¾à®²à¯, à®à®£à¯à®à®¾à®£à®¿à®ªà¯à®ªà®à®¤à¯à®¤à®¾à®²à¯ பà¯à®±à®ªà¯à®ªà®à¯à® à®à®¾à®©à¯à®±à®¿à®¤à®´à¯ à®à®©à®¤à¯ யார௠www.something.com ஠விà®à®¯à®®à¯ à®à¯à®¯à¯à®¤à¯à®³à¯à®³à®¾à®°à¯à®à®³à¯ à®à®©à¯à®±à¯ à®à¯à®±à®¿à®ªà¯à®ªà®¿à®à¯à®®à¯, ஠வà¯à®µà®¾à®±à®¿à®²à¯à®²à®¾à®®à®²à¯ யார௠஠நà¯à®¤ தளதà¯à®¤à¯ விà®à®¯à®®à¯ à®à¯à®¯à¯à®¤à®¾à®°à¯à®à®³à¯ à®à®©à¯à®±à¯, ஠லà¯à®²à®¤à¯ à®à®¨à¯à®¤ à®à¯à®±à®¿à®ªà¯à®ªà®¿à®à¯à® பà®à¯à®à®¤à¯à®¤à¯ ஠வரà¯à®à®³à¯ பாரà¯à®µà¯à®¯à®¿à®à¯à®à®¾à®°à¯à®à®³à¯ à®à®©à¯à®±à¯ à®à¯à®±à®¿à®ªà¯à®ªà®¿à®à®¾à®¤à¯. à®®à¯à®²à¯à®®à¯ விவரà®à¯à®à®³à¯à®à¯à®à¯ வà®à¯à®à®³à®¿à®²à¯ à®à¯à®à¯à®à®¿à®¯à¯ à®®à¯à®²à®¿à®à¯à®:"> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed
commit 40e72a4d2cef2190f6b2009bf97f89d211a36334 Author: Translation commit bot Date: Wed Dec 20 09:47:18 2017 + Update translations for tails-misc_completed --- sv.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv.po b/sv.po index dd2156aab..11a91be17 100644 --- a/sv.po +++ b/sv.po @@ -16,14 +16,14 @@ # miccav, 2014 # ph AA, 2015 # phst, 2015 -# Isis, 2014 +# leveebreaks, 2014 # WinterFairy , 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-09-22 17:39+\n" +"PO-Revision-Date: 2017-12-20 09:29+\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] Update translations for tails-misc
commit 0259f6a27f1174dfa0ed7225a00f1d29d0e373d7 Author: Translation commit bot Date: Wed Dec 20 09:47:13 2017 + Update translations for tails-misc --- sv.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv.po b/sv.po index dd2156aab..11a91be17 100644 --- a/sv.po +++ b/sv.po @@ -16,14 +16,14 @@ # miccav, 2014 # ph AA, 2015 # phst, 2015 -# Isis, 2014 +# leveebreaks, 2014 # WinterFairy , 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-09-22 17:39+\n" +"PO-Revision-Date: 2017-12-20 09:29+\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
commit 6fa07a68c4bd3b49b06bcebae199538c291bdd8b Author: Translation commit bot Date: Wed Dec 20 09:47:39 2017 + Update translations for torbutton-brandproperties_completed --- sv/brand.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/brand.properties b/sv/brand.properties index 555e01e65..7c215e548 100644 --- a/sv/brand.properties +++ b/sv/brand.properties @@ -2,9 +2,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShorterName=Tor Browser -brandShortName=Tor Browser -brandFullName=Tor Browser +brandShorterName=Tor webbläsaren +brandShortName=Tor webbläsaren +brandFullName=Tor webbläsaren vendorShortName=Tor-projektet homePageSingleStartMain=Firefox Start, en snabb hemsida med inbyggd sökfunktion ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-brandproperties] Update translations for torbutton-brandproperties
commit ce7aff111eae08a38623dff7cdcd6f04e6cb7496 Author: Translation commit bot Date: Wed Dec 20 09:47:33 2017 + Update translations for torbutton-brandproperties --- sv/brand.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/brand.properties b/sv/brand.properties index 555e01e65..7c215e548 100644 --- a/sv/brand.properties +++ b/sv/brand.properties @@ -2,9 +2,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShorterName=Tor Browser -brandShortName=Tor Browser -brandFullName=Tor Browser +brandShorterName=Tor webbläsaren +brandShortName=Tor webbläsaren +brandFullName=Tor webbläsaren vendorShortName=Tor-projektet homePageSingleStartMain=Firefox Start, en snabb hemsida med inbyggd sökfunktion ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-perl5lib] Update translations for tails-perl5lib
commit 3f03b1324056d927cde2a8b1b57ae110cfa74670 Author: Translation commit bot Date: Wed Dec 20 09:48:13 2017 + Update translations for tails-perl5lib --- sv.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv.po b/sv.po index fcc2e9779..f13b6eac7 100644 --- a/sv.po +++ b/sv.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" "POT-Creation-Date: 2017-05-20 10:59+0200\n" -"PO-Revision-Date: 2017-09-19 22:59+\n" -"Last-Translator: Jonatan Nyberg\n" +"PO-Revision-Date: 2017-12-20 09:20+\n" +"Last-Translator: Jacob Andersson \n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
commit e8b7d7ae0d320b43e71a43b094338be87aa719f3 Author: Translation commit bot Date: Wed Dec 20 09:48:19 2017 + Update translations for tails-perl5lib_completed --- sv.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv.po b/sv.po index fcc2e9779..f13b6eac7 100644 --- a/sv.po +++ b/sv.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" "POT-Creation-Date: 2017-05-20 10:59+0200\n" -"PO-Revision-Date: 2017-09-19 22:59+\n" -"Last-Translator: Jonatan Nyberg\n" +"PO-Revision-Date: 2017-12-20 09:20+\n" +"Last-Translator: Jacob Andersson \n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-authproperties_completed] Update translations for tor-messenger-authproperties_completed
commit e4de2146c8b2c48356094add637c6917f4b576e7 Author: Translation commit bot Date: Wed Dec 20 09:49:41 2017 + Update translations for tor-messenger-authproperties_completed --- sv/auth.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/auth.properties b/sv/auth.properties index 86279c93e..e031d7d25 100644 --- a/sv/auth.properties +++ b/sv/auth.properties @@ -1,6 +1,6 @@ auth.title=Verifiera identiteten hos %S auth.yourFingerprint=Fingeravtryck för dig, %S:\n%S -auth.theirFingerprint=Föreslaget fingeravtryck för %S:\n%S +auth.theirFingerprint=Påstått fingeravtryck för %S:\n%S auth.help=Genom att verifiera din kontakts identitet hjälper du till att säkerställa att personen du pratar med är den de hävdar sig vara. auth.helpTitle=Hjälp med verifiering auth.question=Det här är frågan din kontakt ställde:\n\n%S\n\nAnge det hemliga svaret här (skiftlägeskänsligt): ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
commit a271f80ccff08efdc2b9f7bb56e6b6ab91cff0ae Author: Translation commit bot Date: Wed Dec 20 09:48:52 2017 + Update translations for torbutton-abouttorproperties --- sv/abouttor.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/abouttor.properties b/sv/abouttor.properties index 016ea20ba..d871467c4 100644 --- a/sv/abouttor.properties +++ b/sv/abouttor.properties @@ -10,11 +10,11 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Donera nu! -aboutTor.donationBanner.slogan=Tor: Kraftfull digital resistans +aboutTor.donationBanner.slogan=Tor: Möjliggör digitalt motstånd aboutTor.donationBanner.mozilla=Ge idag och Mozilla kommer att matcha din gåva! aboutTor.donationBanner.tagline1=Skyddar journalister, whistleblowers och aktivister sedan 2006 aboutTor.donationBanner.tagline2=Nätverksfrihet över hela världen -aboutTor.donationBanner.tagline3=Frihet på nåtet -aboutTor.donationBanner.tagline4=Främja yttrandefriheten över hela världen +aboutTor.donationBanner.tagline3=Frihet på nätet +aboutTor.donationBanner.tagline4=Främjer yttrandefriheten över hela världen aboutTor.donationBanner.tagline5=Skydda integriteten av miljoner varje dag ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
commit 1abcd4df2e5dd87bac4d16d0b65cad1e8321c4d1 Author: Translation commit bot Date: Wed Dec 20 09:49:12 2017 + Update translations for torbutton-abouttbupdatedtd --- sv/abouttbupdate.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/abouttbupdate.dtd b/sv/abouttbupdate.dtd index a57f256a9..da02c4984 100644 --- a/sv/abouttbupdate.dtd +++ b/sv/abouttbupdate.dtd @@ -1,4 +1,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed
commit b29dc8fecbb5946f0de3d02e1f74d4bd768eaafc Author: Translation commit bot Date: Wed Dec 20 09:49:18 2017 + Update translations for torbutton-abouttbupdatedtd_completed --- sv/abouttbupdate.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/abouttbupdate.dtd b/sv/abouttbupdate.dtd index a57f256a9..da02c4984 100644 --- a/sv/abouttbupdate.dtd +++ b/sv/abouttbupdate.dtd @@ -1,4 +1,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
commit aa29704f19369404a7b28ec68467e7649e0627db Author: Translation commit bot Date: Wed Dec 20 09:48:58 2017 + Update translations for torbutton-abouttorproperties_completed --- sv/abouttor.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/abouttor.properties b/sv/abouttor.properties index 016ea20ba..d871467c4 100644 --- a/sv/abouttor.properties +++ b/sv/abouttor.properties @@ -10,11 +10,11 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Donera nu! -aboutTor.donationBanner.slogan=Tor: Kraftfull digital resistans +aboutTor.donationBanner.slogan=Tor: Möjliggör digitalt motstånd aboutTor.donationBanner.mozilla=Ge idag och Mozilla kommer att matcha din gåva! aboutTor.donationBanner.tagline1=Skyddar journalister, whistleblowers och aktivister sedan 2006 aboutTor.donationBanner.tagline2=Nätverksfrihet över hela världen -aboutTor.donationBanner.tagline3=Frihet på nåtet -aboutTor.donationBanner.tagline4=Främja yttrandefriheten över hela världen +aboutTor.donationBanner.tagline3=Frihet på nätet +aboutTor.donationBanner.tagline4=Främjer yttrandefriheten över hela världen aboutTor.donationBanner.tagline5=Skydda integriteten av miljoner varje dag ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-authproperties] Update translations for tor-messenger-authproperties
commit df82a0f77cd0a9ed38a68408d17b5a8bf9969046 Author: Translation commit bot Date: Wed Dec 20 09:49:47 2017 + Update translations for tor-messenger-authproperties --- sv/auth.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/auth.properties b/sv/auth.properties index 86279c93e..e031d7d25 100644 --- a/sv/auth.properties +++ b/sv/auth.properties @@ -1,6 +1,6 @@ auth.title=Verifiera identiteten hos %S auth.yourFingerprint=Fingeravtryck för dig, %S:\n%S -auth.theirFingerprint=Föreslaget fingeravtryck för %S:\n%S +auth.theirFingerprint=Påstått fingeravtryck för %S:\n%S auth.help=Genom att verifiera din kontakts identitet hjälper du till att säkerställa att personen du pratar med är den de hävdar sig vara. auth.helpTitle=Hjälp med verifiering auth.question=Det här är frågan din kontakt ställde:\n\n%S\n\nAnge det hemliga svaret här (skiftlägeskänsligt): ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Add new Tor Browser version: 7.5a10
commit 86a86d757a0fa56cc1117f489c870861e0e0 Author: Nicolas Vigier Date: Wed Dec 20 11:22:02 2017 +0100 Add new Tor Browser version: 7.5a10 --- include/versions.wmi | 4 ++-- projects/torbrowser/RecommendedTBBVersions | 6 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index d229f94e..cd45bf00 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -22,8 +22,8 @@ ../dist/torbrowser//tor-win32-.zip # *** tor browser beta/alpha *** -7.5a9 -2017-12-09 +7.5a10 +2017-12-20 0.0.16 # If all platforms are on the same version, you only need to update diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index ebc53c6e..382fc74b 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -6,5 +6,9 @@ "7.5a9", "7.5a9-MacOS", "7.5a9-Linux", -"7.5a9-Windows" +"7.5a9-Windows", +"7.5a10", +"7.5a10-MacOS", +"7.5a10-Linux", +"7.5a10-Windows" ] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Fix thankyou redirect
commit 4771d7febbf328adc64382fb7b5e00edcaef1f53 Author: hiromipaw Date: Wed Dec 20 11:46:50 2017 +0100 Fix thankyou redirect --- .htaccess | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index f6442986..86a523e0 100644 --- a/.htaccess +++ b/.htaccess @@ -74,7 +74,7 @@ RewriteRule ^images/$ / [R=301,L] RewriteRule ^include/$ / [R=301,L] RewriteRule ^js/$ / [R=301,L] -# Donation campagin +# Donation campaign # 2017 # Special-case the donate-options and amazon page so it doesn't get redirected RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [END] @@ -82,6 +82,7 @@ RewriteRule ^donate/donate-amazon(.*) /donate/donate-amazon$1 [END] RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302,L] RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L] +RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] # The following redirect is necessary because we're using that URL on ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
commit 753c7af4b1d892c8b6397a47daac4e4968298dc0 Merge: 4771d7fe 86a86d75 Author: hiromipaw Date: Wed Dec 20 11:47:04 2017 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml include/versions.wmi | 4 ++-- projects/torbrowser/RecommendedTBBVersions | 6 +- 2 files changed, 7 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] Update translations for tails-misc
commit e20493ea1198d769b26449bac2e822a1aa3474d5 Author: Translation commit bot Date: Wed Dec 20 14:17:08 2017 + Update translations for tails-misc --- nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl.po b/nl.po index ba8f686e1..06c280463 100644 --- a/nl.po +++ b/nl.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-11-24 16:51+\n" +"PO-Revision-Date: 2017-12-20 13:51+\n" "Last-Translator: Thomas van Voorst \n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed
commit bd021027a513adf5e4a5ed166ad66babf74fa0b3 Author: Translation commit bot Date: Wed Dec 20 14:17:13 2017 + Update translations for tails-misc_completed --- nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl.po b/nl.po index ba8f686e1..06c280463 100644 --- a/nl.po +++ b/nl.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-11-24 16:51+\n" +"PO-Revision-Date: 2017-12-20 13:51+\n" "Last-Translator: Thomas van Voorst \n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit 31f777d928da4bf8c7f114eb1c4e5fd40eb0b8af Author: Translation commit bot Date: Wed Dec 20 14:17:51 2017 + Update translations for torbutton-torbuttondtd --- nl/torbutton.dtd | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd index 333e5f1cf..dcb3d1e83 100644 --- a/nl/torbutton.dtd +++ b/nl/torbutton.dtd @@ -33,18 +33,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add monotime functions for clearing monotonic times
commit 4c877ae87483d6e63c9e0309eb8abc009f9b9b87
Author: Nick Mathewson
Date: Wed Dec 13 08:28:04 2017 -0500
Add monotime functions for clearing monotonic times
We need this to replace some of our "msec" users with monotime
users.
---
src/common/compat_time.c | 43 +++
src/common/compat_time.h | 13 +
src/test/test_util.c | 23 +++
3 files changed, 79 insertions(+)
diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index c0cd73c74..fa8dbdfac 100644
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -351,6 +351,12 @@ monotime_coarse_to_stamp(const monotime_coarse_t *t)
return (uint32_t)(t->abstime_ >> monotime_shift);
}
+int
+monotime_is_zero(const monotime_t *val)
+{
+ return val->abstime_ == 0;
+}
+
/* end of "__APPLE__" */
#elif defined(HAVE_CLOCK_GETTIME)
@@ -441,6 +447,12 @@ monotime_coarse_to_stamp(const monotime_coarse_t *t)
return (sec * STAMP_TICKS_PER_SECOND) + (nsec >> 20);
}
+int
+monotime_is_zero(const monotime_t *val)
+{
+ return val->ts_.tv_sec == 0 && val->ts_.tv_nsec == 0;
+}
+
/* end of "HAVE_CLOCK_GETTIME" */
#elif defined (_WIN32)
@@ -581,6 +593,18 @@ monotime_coarse_to_stamp(const monotime_coarse_t *t)
return (uint32_t) t->tick_count_;
}
+int
+monotime_is_zero(const monotime_t *val)
+{
+ return val->pcount_ == 0;
+}
+
+int
+monotime_coarse_is_zero(const monotime_coarse_t *val)
+{
+ return val->tick_count_ == 0;
+}
+
/* end of "_WIN32" */
#elif defined(MONOTIME_USING_GETTIMEOFDAY)
@@ -628,6 +652,12 @@ monotime_coarse_to_stamp(const monotime_coarse_t *t)
return (sec * STAMP_TICKS_PER_SECOND) | (nsec >> 10);
}
+int
+monotime_is_zero(const monotime_t *val)
+{
+ return val->tv_.tv_sec == 0 && val->tv_.tv_usec == 0;
+}
+
/* end of "MONOTIME_USING_GETTIMEOFDAY" */
#else
#error "No way to implement monotonic timers."
@@ -650,6 +680,19 @@ monotime_init(void)
}
}
+void
+monotime_zero(monotime_t *out)
+{
+ memset(out, 0, sizeof(*out));
+}
+#ifdef MONOTIME_COARSE_TYPE_IS_DIFFERENT
+void
+monotime_coarse_zero(monotime_coarse_t *out)
+{
+ memset(out, 0, sizeof(*out));
+}
+#endif
+
int64_t
monotime_diff_usec(const monotime_t *start,
const monotime_t *end)
diff --git a/src/common/compat_time.h b/src/common/compat_time.h
index bcf469e27..68c11fb60 100644
--- a/src/common/compat_time.h
+++ b/src/common/compat_time.h
@@ -105,6 +105,15 @@ uint64_t monotime_absolute_usec(void);
*/
uint64_t monotime_absolute_msec(void);
+/**
+ * Set out to zero.
+ */
+void monotime_zero(monotime_t *out);
+/**
+ * Return true iff out is zero
+ */
+int monotime_is_zero(const monotime_t *out);
+
#if defined(MONOTIME_COARSE_FN_IS_DIFFERENT)
/**
* Set out to the current coarse time.
@@ -144,10 +153,14 @@ int64_t monotime_coarse_diff_usec(const monotime_coarse_t
*start,
const monotime_coarse_t *end);
int64_t monotime_coarse_diff_msec(const monotime_coarse_t *start,
const monotime_coarse_t *end);
+void monotime_coarse_zero(monotime_coarse_t *out);
+int monotime_coarse_is_zero(const monotime_coarse_t *val);
#else /* !(defined(MONOTIME_COARSE_TYPE_IS_DIFFERENT)) */
#define monotime_coarse_diff_nsec monotime_diff_nsec
#define monotime_coarse_diff_usec monotime_diff_usec
#define monotime_coarse_diff_msec monotime_diff_msec
+#define monotime_coarse_zero monotime_zero
+#define monotime_coarse_is_zero monotime_is_zero
#endif /* defined(MONOTIME_COARSE_TYPE_IS_DIFFERENT) */
void tor_gettimeofday(struct timeval *timeval);
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 7856b506b..7210f1674 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -5926,6 +5926,28 @@ test_util_monotonic_time_ratchet(void *arg)
}
static void
+test_util_monotonic_time_zero(void *arg)
+{
+ (void) arg;
+ monotime_t t1;
+ monotime_coarse_t ct1;
+ monotime_init();
+ /* Check 1: The current time is not zero. */
+ monotime_get(&t1);
+ monotime_coarse_get(&ct1);
+ tt_assert(!monotime_is_zero(&t1));
+ tt_assert(!monotime_coarse_is_zero(&ct1));
+
+ /* Check 2: The _zero() makes the time zero. */
+ monotime_zero(&t1);
+ monotime_coarse_zero(&ct1);
+ tt_assert(monotime_is_zero(&t1));
+ tt_assert(monotime_coarse_is_zero(&ct1));
+ done:
+ ;
+}
+
+static void
test_util_htonll(void *arg)
{
(void)arg;
@@ -6158,6 +6180,7 @@ struct testcase_t util_tests[] = {
UTIL_TEST(calloc_check, 0),
UTIL_TEST(monotonic_time, 0),
UTIL_TEST(monotonic_time_ratchet, TT_FORK),
+ UTIL_TEST(monotonic_time_zero, 0),
UTIL_TEST(htonll, 0),
UTIL_TEST(get_unquoted_path, 0),
END_OF_TESTCASES
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add a function to add msec to a monotime.
commit dd6dec2665af9964d8f940c27f3f0815a649424a
Author: Nick Mathewson
Date: Wed Dec 13 08:54:29 2017 -0500
Add a function to add msec to a monotime.
We'll use this for the channel padding logic.
---
src/common/compat_time.c | 48
src/common/compat_time.h | 9 +
src/test/test_util.c | 28
3 files changed, 85 insertions(+)
diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index fa8dbdfac..396a7b754 100644
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -357,6 +357,14 @@ monotime_is_zero(const monotime_t *val)
return val->abstime_ == 0;
}
+void
+monotime_add_msec(monotime_t *out, const monotime_t *val, uint32_t msec)
+{
+ const uint64_t nsec = msec * ONE_MILLION;
+ const uint64_t ticks = (nsec * mach_time_info.denom) / mach_time_info.numer;
+ out->abstime_ = val->abstime_ + ticks;
+}
+
/* end of "__APPLE__" */
#elif defined(HAVE_CLOCK_GETTIME)
@@ -453,6 +461,19 @@ monotime_is_zero(const monotime_t *val)
return val->ts_.tv_sec == 0 && val->ts_.tv_nsec == 0;
}
+void
+monotime_add_msec(monotime_t *out, const monotime_t *val, uint32_t msec)
+{
+ const uint32_t sec = msec / 1000;
+ const uint32_t msec_remainder = msec % 1000;
+ out->ts_.tv_sec = val->ts_.tv_sec + sec;
+ out->ts_.tv_nsec = val->ts_.tv_nsec + (msec_remainder * ONE_MILLION);
+ if (out->ts_.tv_nsec > ONE_BILLION) {
+out->ts_.tv_nsec -= ONE_BILLION;
+out->ts_.tv_sec += 1;
+ }
+}
+
/* end of "HAVE_CLOCK_GETTIME" */
#elif defined (_WIN32)
@@ -605,6 +626,20 @@ monotime_coarse_is_zero(const monotime_coarse_t *val)
return val->tick_count_ == 0;
}
+void
+monotime_add_msec(monotime_t *out, const monotime_t *val, uint32_t msec)
+{
+ const uint64_t nsec = msec * ONE_MILLION;
+ const uint64_t ticks = (nsec * nsec_per_tick_denom) / nsec_per_tick_numer;
+ out->pcount_ = val->pcount_ + ticks;
+}
+
+void
+monotime_coarse_add_msec(monotime_t *out, const monotime_t *val, uint32_t msec)
+{
+ out->tick_count_ = val->tick_count_ + msec;
+}
+
/* end of "_WIN32" */
#elif defined(MONOTIME_USING_GETTIMEOFDAY)
@@ -658,6 +693,19 @@ monotime_is_zero(const monotime_t *val)
return val->tv_.tv_sec == 0 && val->tv_.tv_usec == 0;
}
+void
+monotime_add_msec(monotime_t *out, const monotime_t *val, uint32_t msec)
+{
+ const uint32_t sec = msec / 1000;
+ const uint32_t msec_remainder = msec % 1000;
+ out->tv_.tv_sec = val->tv_.tv_sec + sec;
+ out->tv_.tv_usec = val->tv_.tv_nsec + (msec_remainder * 1000);
+ if (out->tv_.tv_usec > ONE_MILLION) {
+out->tv_.tv_usec -= ONE_MILLION;
+out->tv_.tv_sec += 1;
+ }
+}
+
/* end of "MONOTIME_USING_GETTIMEOFDAY" */
#else
#error "No way to implement monotonic timers."
diff --git a/src/common/compat_time.h b/src/common/compat_time.h
index 68c11fb60..6ddd11883 100644
--- a/src/common/compat_time.h
+++ b/src/common/compat_time.h
@@ -114,6 +114,12 @@ void monotime_zero(monotime_t *out);
*/
int monotime_is_zero(const monotime_t *out);
+/**
+ * Set out to N milliseconds after val.
+ */
+/* We should add a more generic function here if we ever need to */
+void monotime_add_msec(monotime_t *out, const monotime_t *val, uint32_t msec);
+
#if defined(MONOTIME_COARSE_FN_IS_DIFFERENT)
/**
* Set out to the current coarse time.
@@ -155,12 +161,15 @@ int64_t monotime_coarse_diff_msec(const monotime_coarse_t
*start,
const monotime_coarse_t *end);
void monotime_coarse_zero(monotime_coarse_t *out);
int monotime_coarse_is_zero(const monotime_coarse_t *val);
+void monotime_coarse_add_msec(monotime_coarse_t *out,
+ const monotime_coarse_t *val, uint32_t msec);
#else /* !(defined(MONOTIME_COARSE_TYPE_IS_DIFFERENT)) */
#define monotime_coarse_diff_nsec monotime_diff_nsec
#define monotime_coarse_diff_usec monotime_diff_usec
#define monotime_coarse_diff_msec monotime_diff_msec
#define monotime_coarse_zero monotime_zero
#define monotime_coarse_is_zero monotime_is_zero
+#define monotime_coarse_add_msec monotime_add_msec
#endif /* defined(MONOTIME_COARSE_TYPE_IS_DIFFERENT) */
void tor_gettimeofday(struct timeval *timeval);
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 7210f1674..1c58ad695 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -5948,6 +5948,33 @@ test_util_monotonic_time_zero(void *arg)
}
static void
+test_util_monotonic_time_add_msec(void *arg)
+{
+ (void) arg;
+ monotime_t t1, t2;
+ monotime_coarse_t ct1, ct2;
+ monotime_init();
+
+ monotime_get(&t1);
+ monotime_coarse_get(&ct1);
+
+ /* adding zero does nothing */
+ monotime_add_msec(&t2, &t1, 0);
+ monotime_coarse_add_msec(&ct2, &ct1, 0);
+ tt_i64_op(monotime_diff_msec(&t1, &t2), OP_EQ, 0);
+ tt_i64_op(monotime_coarse_diff_msec(&ct1, &ct2), OP_EQ, 0);
+
+ /* Add 1337 msec; see if the diff function agree */
+ monotime_add_msec(&t2, &t1, 1337);
+ monotime_coarse_add_msec(&ct2, &ct1, 1337);
+ tt_i6
[tor-commits] [tor/master] Use monotime_coarse for transfer times and padding times
commit 219c969d7bf858c4df5fc6ee9b0c472a525b6b2a
Author: Nick Mathewson
Date: Wed Dec 13 09:34:20 2017 -0500
Use monotime_coarse for transfer times and padding times
Using absolute_msec requires a 64-bit division operation every time
we calculate it, which gets expensive on 32-bit architectures.
Instead, just use the lazy "monotime_coarse_get()" operation, and
don't convert to milliseconds until we absolutely must.
In this case, it seemed fine to use a full monotime_coarse_t rather
than a truncated "stamp" as we did to solve this problem for the
timerstamps in buf_t and packed_cell_t: There are vastly more cells
and buffer chunks than there are channels, and using 16 bytes per
channel in the worst case is not a big deal.
There are still more millisecond operations here than strictly
necessary; let's see any divisions show up in profiles.
---
changes/bug24613 | 4 ++
src/or/channel.c | 12 ++---
src/or/channel.h | 11 ++--
src/or/channelpadding.c| 54 +++-
src/test/test_channel.c| 6 +--
src/test/test_channelpadding.c | 112 ++---
6 files changed, 118 insertions(+), 81 deletions(-)
diff --git a/changes/bug24613 b/changes/bug24613
new file mode 100644
index 0..d718f8f94
--- /dev/null
+++ b/changes/bug24613
@@ -0,0 +1,4 @@
+ o Minor features (performance, 32-bit):
+- Improve performance on 32-bit systems by avoiding 64-bit division
+ to calculate the current timestamp in milliseconds for channel
+ padding computations. Implements ticket 24613.
diff --git a/src/or/channel.c b/src/or/channel.c
index 7fa976817..845fc3cb4 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -3241,12 +3241,12 @@ channel_timestamp_active(channel_t *chan)
time_t now = time(NULL);
tor_assert(chan);
- chan->timestamp_xfer_ms = monotime_coarse_absolute_msec();
+ monotime_coarse_get(&chan->timestamp_xfer);
chan->timestamp_active = now;
/* Clear any potential netflow padding timer. We're active */
- chan->next_padding_time_ms = 0;
+ monotime_coarse_zero(&chan->next_padding_time);
}
/**
@@ -3311,13 +3311,13 @@ channel_timestamp_recv(channel_t *chan)
{
time_t now = time(NULL);
tor_assert(chan);
- chan->timestamp_xfer_ms = monotime_coarse_absolute_msec();
+ monotime_coarse_get(&chan->timestamp_xfer);
chan->timestamp_active = now;
chan->timestamp_recv = now;
/* Clear any potential netflow padding timer. We're active */
- chan->next_padding_time_ms = 0;
+ monotime_coarse_zero(&chan->next_padding_time);
}
/**
@@ -3332,13 +3332,13 @@ channel_timestamp_xmit(channel_t *chan)
time_t now = time(NULL);
tor_assert(chan);
- chan->timestamp_xfer_ms = monotime_coarse_absolute_msec();
+ monotime_coarse_get(&chan->timestamp_xfer);
chan->timestamp_active = now;
chan->timestamp_xmit = now;
/* Clear any potential netflow padding timer. We're active */
- chan->next_padding_time_ms = 0;
+ monotime_coarse_zero(&chan->next_padding_time);
}
/***
diff --git a/src/or/channel.h b/src/or/channel.h
index 0f685011a..4b60b7a7d 100644
--- a/src/or/channel.h
+++ b/src/or/channel.h
@@ -88,10 +88,9 @@ struct channel_s {
* Used to decide what channels to pad, and when. */
channel_usage_info_t channel_usage;
- /** When should we send a cell for netflow padding, in absolute
- * milliseconds since monotime system start. 0 means no padding
- * is scheduled. */
- uint64_t next_padding_time_ms;
+ /** When should we send a cell for netflow padding? 0 means no padding is
+ * scheduled. */
+ monotime_coarse_t next_padding_time;
/** The callback pointer for the padding callbacks */
tor_timer_t *padding_timer;
@@ -158,7 +157,7 @@ struct channel_s {
time_t timestamp_active; /* Any activity */
/**
- * This is a high-resolution monotonic timestamp that marks when we
+ * This is a monotonic timestamp that marks when we
* believe the channel has actually sent or received data to/from
* the wire. Right now, it is used to determine when we should send
* a padding cell for channelpadding.
@@ -167,7 +166,7 @@ struct channel_s {
* accurately reflect actual network data transfer? Or might this be
* very wrong wrt when bytes actually go on the wire?
*/
- uint64_t timestamp_xfer_ms;
+ monotime_coarse_t timestamp_xfer;
/* Methods implemented by the lower layer */
diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c
index 435436c45..70a906d23 100644
--- a/src/or/channelpadding.c
+++ b/src/or/channelpadding.c
@@ -23,7 +23,8 @@
#include
#include "rendservice.h"
-STATIC int channelpadding_get_netflow_inactive_timeout_ms(const channel_t *);
+STATIC int32_t channelpadding_get_netflow_inactive_timeout_ms(
+ const
[tor-commits] [tor/master] Merge branch 'xfer_time_coarse'
commit 69a320ce5d84308c8749e9311ad6888d5aae5d3b Merge: d43dc120e 60bf8f6cf Author: Nick Mathewson Date: Wed Dec 20 09:15:30 2017 -0500 Merge branch 'xfer_time_coarse' changes/bug24613 | 4 ++ src/common/compat_time.c | 91 + src/common/compat_time.h | 22 src/or/channel.c | 12 ++--- src/or/channel.h | 11 ++-- src/or/channelpadding.c| 54 +++- src/test/test_channel.c| 6 +-- src/test/test_channelpadding.c | 112 ++--- src/test/test_util.c | 61 ++ 9 files changed, 292 insertions(+), 81 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] whitespace fix
commit 28fbfa871234577310ccd2efc30a4faa30f1355d Author: Nick Mathewson Date: Wed Dec 20 09:17:13 2017 -0500 whitespace fix --- src/test/test_util.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 9d139917f..1fd41a348 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5979,7 +5979,6 @@ test_util_monotonic_time_add_msec(void *arg) tt_i64_op(monotime_diff_msec(&t1, &t2), OP_EQ, 1337*3); tt_i64_op(monotime_coarse_diff_msec(&ct1, &ct2), OP_EQ, 1337*3); - done: ; } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Improve add_msec test to cover ms->sec rollover
commit 60bf8f6cf6295808eec542be31649b0bd82ad926 Author: Nick Mathewson Date: Wed Dec 20 09:12:38 2017 -0500 Improve add_msec test to cover ms->sec rollover Per mikeperry's suggestion, I'm making sure that the millisecond part of the time will always roll over in this test. --- src/test/test_util.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 1c58ad695..9d139917f 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5970,6 +5970,16 @@ test_util_monotonic_time_add_msec(void *arg) tt_i64_op(monotime_diff_msec(&t1, &t2), OP_EQ, 1337); tt_i64_op(monotime_coarse_diff_msec(&ct1, &ct2), OP_EQ, 1337); + /* Add 1337 msec twice more; make sure that any second rollover issues + * worked. */ + monotime_add_msec(&t2, &t2, 1337); + monotime_coarse_add_msec(&ct2, &ct2, 1337); + monotime_add_msec(&t2, &t2, 1337); + monotime_coarse_add_msec(&ct2, &ct2, 1337); + tt_i64_op(monotime_diff_msec(&t1, &t2), OP_EQ, 1337*3); + tt_i64_op(monotime_coarse_diff_msec(&ct1, &ct2), OP_EQ, 1337*3); + + done: ; } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'dgoulet/ticket24425_032_01' into maint-0.3.2
commit fc33caadaebdb06d39068f4492431902c93ee8a7 Merge: 5c4da2cac 7bb269548 Author: Nick Mathewson Date: Wed Dec 20 09:59:06 2017 -0500 Merge remote-tracking branch 'dgoulet/ticket24425_032_01' into maint-0.3.2 changes/ticket24425 | 4 src/or/hs_common.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] hs-v3: Bump hsdir_spread_store from 3 to 4
commit 7bb269548db1170b97457ef1b5a4e9267f62ecf2 Author: David Goulet Date: Wed Nov 29 09:19:02 2017 -0500 hs-v3: Bump hsdir_spread_store from 3 to 4 Per the analysis in https://trac.torproject.org/projects/tor/ticket/23170#comment:17, this will greatly improve service reachability. Closes #24425 Signed-off-by: David Goulet --- changes/ticket24425 | 4 src/or/hs_common.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/ticket24425 b/changes/ticket24425 new file mode 100644 index 0..aa6f082bc --- /dev/null +++ b/changes/ticket24425 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service v3): +- Bump hsdir_spread_store parameter from 3 to 4 in order to increase the + probability of reaching a service for a client missing microdescriptors. + Fixes bug 24425; bugfix on 0.3.2.1-alpha. diff --git a/src/or/hs_common.h b/src/or/hs_common.h index c95e59a6f..1ddbeb55f 100644 --- a/src/or/hs_common.h +++ b/src/or/hs_common.h @@ -114,7 +114,7 @@ /* Default value of number of hsdir replicas (hsdir_n_replicas). */ #define HS_DEFAULT_HSDIR_N_REPLICAS 2 /* Default value of hsdir spread store (hsdir_spread_store). */ -#define HS_DEFAULT_HSDIR_SPREAD_STORE 3 +#define HS_DEFAULT_HSDIR_SPREAD_STORE 4 /* Default value of hsdir spread fetch (hsdir_spread_fetch). */ #define HS_DEFAULT_HSDIR_SPREAD_FETCH 3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket24425_032_01' into maint-0.3.2
commit fc33caadaebdb06d39068f4492431902c93ee8a7 Merge: 5c4da2cac 7bb269548 Author: Nick Mathewson Date: Wed Dec 20 09:59:06 2017 -0500 Merge remote-tracking branch 'dgoulet/ticket24425_032_01' into maint-0.3.2 changes/ticket24425 | 4 src/or/hs_common.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'dgoulet/ticket24425_032_01' into maint-0.3.2
commit fc33caadaebdb06d39068f4492431902c93ee8a7 Merge: 5c4da2cac 7bb269548 Author: Nick Mathewson Date: Wed Dec 20 09:59:06 2017 -0500 Merge remote-tracking branch 'dgoulet/ticket24425_032_01' into maint-0.3.2 changes/ticket24425 | 4 src/or/hs_common.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.2'
commit 83ced3e7fe6c7573e17b61ecb1be873fa972b635 Merge: 28fbfa871 fc33caada Author: Nick Mathewson Date: Wed Dec 20 09:59:51 2017 -0500 Merge branch 'maint-0.3.2' changes/ticket24425 | 4 src/or/hs_common.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] hs-v3: Bump hsdir_spread_store from 3 to 4
commit 7bb269548db1170b97457ef1b5a4e9267f62ecf2 Author: David Goulet Date: Wed Nov 29 09:19:02 2017 -0500 hs-v3: Bump hsdir_spread_store from 3 to 4 Per the analysis in https://trac.torproject.org/projects/tor/ticket/23170#comment:17, this will greatly improve service reachability. Closes #24425 Signed-off-by: David Goulet --- changes/ticket24425 | 4 src/or/hs_common.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/ticket24425 b/changes/ticket24425 new file mode 100644 index 0..aa6f082bc --- /dev/null +++ b/changes/ticket24425 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service v3): +- Bump hsdir_spread_store parameter from 3 to 4 in order to increase the + probability of reaching a service for a client missing microdescriptors. + Fixes bug 24425; bugfix on 0.3.2.1-alpha. diff --git a/src/or/hs_common.h b/src/or/hs_common.h index c95e59a6f..1ddbeb55f 100644 --- a/src/or/hs_common.h +++ b/src/or/hs_common.h @@ -114,7 +114,7 @@ /* Default value of number of hsdir replicas (hsdir_n_replicas). */ #define HS_DEFAULT_HSDIR_N_REPLICAS 2 /* Default value of hsdir spread store (hsdir_spread_store). */ -#define HS_DEFAULT_HSDIR_SPREAD_STORE 3 +#define HS_DEFAULT_HSDIR_SPREAD_STORE 4 /* Default value of hsdir spread fetch (hsdir_spread_fetch). */ #define HS_DEFAULT_HSDIR_SPREAD_FETCH 3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] hs-v3: Bump hsdir_spread_store from 3 to 4
commit 7bb269548db1170b97457ef1b5a4e9267f62ecf2 Author: David Goulet Date: Wed Nov 29 09:19:02 2017 -0500 hs-v3: Bump hsdir_spread_store from 3 to 4 Per the analysis in https://trac.torproject.org/projects/tor/ticket/23170#comment:17, this will greatly improve service reachability. Closes #24425 Signed-off-by: David Goulet --- changes/ticket24425 | 4 src/or/hs_common.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/ticket24425 b/changes/ticket24425 new file mode 100644 index 0..aa6f082bc --- /dev/null +++ b/changes/ticket24425 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service v3): +- Bump hsdir_spread_store parameter from 3 to 4 in order to increase the + probability of reaching a service for a client missing microdescriptors. + Fixes bug 24425; bugfix on 0.3.2.1-alpha. diff --git a/src/or/hs_common.h b/src/or/hs_common.h index c95e59a6f..1ddbeb55f 100644 --- a/src/or/hs_common.h +++ b/src/or/hs_common.h @@ -114,7 +114,7 @@ /* Default value of number of hsdir replicas (hsdir_n_replicas). */ #define HS_DEFAULT_HSDIR_N_REPLICAS 2 /* Default value of hsdir spread store (hsdir_spread_store). */ -#define HS_DEFAULT_HSDIR_SPREAD_STORE 3 +#define HS_DEFAULT_HSDIR_SPREAD_STORE 4 /* Default value of hsdir spread fetch (hsdir_spread_fetch). */ #define HS_DEFAULT_HSDIR_SPREAD_FETCH 3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
commit 64c88c71995b5320d3951496b9b8f01ed2cf4a7b Merge: 4f8a0ed62 fc33caada Author: Nick Mathewson Date: Wed Dec 20 09:59:51 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket24425 | 4 src/or/hs_common.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] document hsdir_spread_store default change
commit 405e77f109d7963c11ad04a077e3cc7b11bc21e9 Author: Nick Mathewson Date: Wed Dec 20 10:01:27 2017 -0500 document hsdir_spread_store default change --- rend-spec-v3.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rend-spec-v3.txt b/rend-spec-v3.txt index ef5f940..45766bc 100644 --- a/rend-spec-v3.txt +++ b/rend-spec-v3.txt @@ -772,7 +772,8 @@ Table of contents: hsdir_n_replicas = an integer in range [1,16] with default value 2. hsdir_spread_fetch = an integer in range [1,128] with default value 3. -hsdir_spread_store = an integer in range [1,128] with default value 3. +hsdir_spread_store = an integer in range [1,128] with default value 4. + (Until 0.3.2.8-rc, the default was 3.) To determine where a given hidden service descriptor will be stored in a given period, after the blinded public key for that period is ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'teor/ticket24682'
commit f92b5337573bcc5bf94cd034c033c11db4eca811 Merge: 83ced3e7f 1a29ad611 Author: Nick Mathewson Date: Wed Dec 20 10:14:43 2017 -0500 Merge remote-tracking branch 'teor/ticket24682' scripts/maint/updateFallbackDirs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Make fallback script usage instructions create a log file
commit 1a29ad611cccef7f33ae992b87f4b07242b05a82 Author: teor Date: Wed Dec 20 12:36:31 2017 +1100 Make fallback script usage instructions create a log file Comment-only change. Closes 24682. --- scripts/maint/updateFallbackDirs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 82a60420b..4d00c0fac 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -1,12 +1,13 @@ #!/usr/bin/python # Usage: +<<< Updated upstream # # Regenerate the list: -# scripts/maint/updateFallbackDirs.py > src/or/fallback_dirs.inc +# scripts/maint/updateFallbackDirs.py > src/or/fallback_dirs.inc 2> fallback_dirs.log # # Check the existing list: -# scripts/maint/updateFallbackDirs.py check_existing > fallback_dirs.inc.ok +# scripts/maint/updateFallbackDirs.py check_existing > fallback_dirs.inc.ok 2> fallback_dirs.log # mv fallback_dirs.inc.ok src/or/fallback_dirs.inc # # This script should be run from a stable, reliable network connection, ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Remove merge-conflict detritus
commit 8e5450b7524798467479ebe2aef0f7081a74ea48 Author: Nick Mathewson Date: Wed Dec 20 10:15:00 2017 -0500 Remove merge-conflict detritus --- scripts/maint/updateFallbackDirs.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 4d00c0fac..3efd408ec 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -1,7 +1,6 @@ #!/usr/bin/python # Usage: -<<< Updated upstream # # Regenerate the list: # scripts/maint/updateFallbackDirs.py > src/or/fallback_dirs.inc 2> fallback_dirs.log ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit 269dcb82cb9133cb529156dc48538146913665f9 Author: Translation commit bot Date: Wed Dec 20 15:15:39 2017 + Update translations for https_everywhere --- ta/ssl-observatory.dtd | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ta/ssl-observatory.dtd b/ta/ssl-observatory.dtd index 9013b6cb4..8717fdb57 100644 --- a/ta/ssl-observatory.dtd +++ b/ta/ssl-observatory.dtd @@ -73,13 +73,13 @@ Mouseover the options for further details:">--> "Tor à®à®²à¯à®²à¯ à®à®©à¯à®±à®¾à®²à¯à®®à¯ à®à®¾à®©à¯à®±à®¿à®¤à®´à¯à®à®³à¯ à®à®°à®¿à®ªà®¾à®°à¯à®à¯à®à®µà¯à®®à¯"> +"நாà®à¯à®à®³à¯ à®à®à¯à®à®³à¯ தரவà¯à®à®³à¯ à® à®à¯à®¯à®¾à®³à®®à®¿à®©à¯à®±à®¿ வà¯à®¤à¯à®¤à¯à®à¯à®à¯à®³à¯à®³ à®à®ªà¯à®ªà®µà¯à®®à¯ à®®à¯à®¯à®±à¯à®à®¿à®à¯à®à®¿à®±à¯à®®à¯, à®à®©à®¾à®²à¯ à®à®¨à¯à®¤ வà®à¯à®¯à®¾à®©à®¤à¯ பாதà¯à®à®¾à®ªà¯à®ªà¯ à®à¯à®±à¯à®¨à¯à®¤à®¤à¯"> +"பà¯à®¤à¯à®µà®±à¯à®± DNS பà¯à®¯à®°à¯à®à®³à¯à®à¯à®à®¾à®© à®à®¾à®©à¯à®±à®¿à®¤à®´à¯à®à®³à¯ à®à®®à®°à¯à®ªà®¿à®¤à¯à®¤à¯ à®à¯à®¤à®©à¯à®¯à®¿à®"> +"à®à®¨à¯à®¤ வà®à¯à®¯à®¾à®©à®¤à¯ தà¯à®°à¯à®¨à¯à®¤à¯à®à¯à®à¯à®à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯ à®à®©à¯à®±à®¾à®²à¯, à®à®£à¯à®à®¾à®£à®¿à®ªà¯à®ªà®à®®à®¾à®©à®¤à¯ DNS à® à®®à¯à®ªà¯à®ªà®¿à®©à¯ à®®à¯à®²à®®à¯ à®à®±à¯à®¤à®¿ à®à¯à®¯à¯à®¯ à®®à¯à®à®¿à®¯à®¾à®¤ பà¯à®¯à®°à¯à®à®³à¯à®à¯à®à®¾à®© à®à®¾à®©à¯à®±à®¿à®¤à®´à¯à®à®³à¯ பதிவ௠à®à¯à®¯à¯à®¯à®¾à®¤à¯."> @@ -89,10 +89,10 @@ Mouseover the options for further details:">--> - - + + +"à®à®¤à¯ பரிநà¯à®¤à¯à®°à¯à®à¯à®à®ªà®à¯à®à®¿à®±à®¤à¯; à®à¯à®±à®¿à®ªà¯à®ªà®¾à® à®à¯à®¯-à®à¯à®¯à¯à®ªà¯à®ªà®®à®¿à®à¯à® à®à®à¯à®ªà¯à®¤à®¿à®¨à¯à®¤ à®à®¾à®¤à®©à®à¯à®à®³à®¿à®²à¯ à®à®¿à®°à®¿à®ªà¯à®à¯à®à¯à®°à®ªà®¿à®à¯ பிரà®à¯à®à®©à¯à®à®³à¯ பà¯à®¤à¯à®µà®¾à®©à®¤à¯"> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit 908f9074ec3d5fe66f6d964783ea4ea5b8d666bd Author: Translation commit bot Date: Wed Dec 20 15:15:50 2017 + Update translations for https_everywhere_completed --- ta/ssl-observatory.dtd | 98 ++ 1 file changed, 98 insertions(+) diff --git a/ta/ssl-observatory.dtd b/ta/ssl-observatory.dtd new file mode 100644 index 0..8717fdb57 --- /dev/null +++ b/ta/ssl-observatory.dtd @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +https://www.something.com à®à¯à®à¯ à®à¯à®©à¯à®±à®¾à®²à¯, à®à®£à¯à®à®¾à®£à®¿à®ªà¯à®ªà®à®¤à¯à®¤à®¾à®²à¯ பà¯à®±à®ªà¯à®ªà®à¯à® à®à®¾à®©à¯à®±à®¿à®¤à®´à¯ à®à®©à®¤à¯ யார௠www.something.com ஠விà®à®¯à®®à¯ à®à¯à®¯à¯à®¤à¯à®³à¯à®³à®¾à®°à¯à®à®³à¯ à®à®©à¯à®±à¯ à®à¯à®±à®¿à®ªà¯à®ªà®¿à®à¯à®®à¯, ஠வà¯à®µà®¾à®±à®¿à®²à¯à®²à®¾à®®à®²à¯ யார௠஠நà¯à®¤ தளதà¯à®¤à¯ விà®à®¯à®®à¯ à®à¯à®¯à¯à®¤à®¾à®°à¯à®à®³à¯ à®à®©à¯à®±à¯, ஠லà¯à®²à®¤à¯ à®à®¨à¯à®¤ à®à¯à®±à®¿à®ªà¯à®ªà®¿à®à¯à® பà®à¯à®à®¤à¯à®¤à¯ ஠வரà¯à®à®³à¯ பாரà¯à®µà¯à®¯à®¿à®à¯à®à®¾à®°à¯à®à®³à¯ à®à®©à¯à®±à¯ à®à¯à®±à®¿à®ªà¯à®ªà®¿à®à®¾à®¤à¯. à®®à¯à®²à¯à®®à¯ விவரà®à¯à®à®³à¯à®à¯à®à¯ வà®à¯à®à®³à®¿à®²à¯ à®à¯à®à¯à®à®¿à®¯à¯ à®®à¯à®²à®¿à®à¯à®:"> + + + + + + + + + + + + + + + + + + + + + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbirdy_completed] Update translations for torbirdy_completed
commit 1208f6df595fedbe566e945f29e7adb5f493212b Author: Translation commit bot Date: Wed Dec 20 15:16:25 2017 + Update translations for torbirdy_completed --- nl/torbirdy.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nl/torbirdy.dtd b/nl/torbirdy.dtd index bfbec31c9..d5c232d9c 100644 --- a/nl/torbirdy.dtd +++ b/nl/torbirdy.dtd @@ -38,6 +38,8 @@ + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbirdy] Update translations for torbirdy
commit 34ed7b41dcc5143410545d441ceaa61b174519d0 Author: Translation commit bot Date: Wed Dec 20 15:16:18 2017 + Update translations for torbirdy --- nl/torbirdy.dtd | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nl/torbirdy.dtd b/nl/torbirdy.dtd index cebe13129..d5c232d9c 100644 --- a/nl/torbirdy.dtd +++ b/nl/torbirdy.dtd @@ -38,9 +38,7 @@ - - - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
commit 1c3e2e4aa494f337f9c81411340d0020ac3bf3ee Author: Translation commit bot Date: Wed Dec 20 15:16:59 2017 + Update translations for tor-launcher-network-settings --- nl/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/network-settings.dtd b/nl/network-settings.dtd index a1e2a8396..45619c377 100644 --- a/nl/network-settings.dtd +++ b/nl/network-settings.dtd @@ -10,7 +10,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
commit a4ed451dc181c93728648af9c86c13265807ca88 Author: Translation commit bot Date: Wed Dec 20 15:17:05 2017 + Update translations for tor-launcher-network-settings_completed --- nl/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/network-settings.dtd b/nl/network-settings.dtd index 45bd283ac..45619c377 100644 --- a/nl/network-settings.dtd +++ b/nl/network-settings.dtd @@ -10,7 +10,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
commit fa1712b6b6cd7910c9a5da96a9ae60e89a3f8738 Author: Translation commit bot Date: Wed Dec 20 15:19:50 2017 + Update translations for tor-messenger-prefsdtd --- ta/prefs.dtd | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ta/prefs.dtd b/ta/prefs.dtd index 934e664d4..30a515b32 100644 --- a/ta/prefs.dtd +++ b/ta/prefs.dtd @@ -1,20 +1,20 @@ - + - - - - + + + + - - - - - - - + + + + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-uiproperties] Update translations for tor-messenger-uiproperties
commit c88ff6cb22177f395cd7f21a7433814fdd26f96f Author: Translation commit bot Date: Wed Dec 20 15:20:17 2017 + Update translations for tor-messenger-uiproperties --- ta/ui.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ta/ui.properties b/ta/ui.properties index 075b10ae1..1d488ab1c 100644 --- a/ta/ui.properties +++ b/ta/ui.properties @@ -10,7 +10,7 @@ auth.successThem=Your contact has successfully verified your identity. You may w auth.fail=Failed to verify your contact's identity. auth.waiting=தà¯à®à®°à¯à®ªà®¿à®±à¯à®à®¾à® à®à®¾à®¤à¯à®¤à®¿à®°à¯à®à¯à®à®¿à®±à¯à®©à¯... reauth.label=Reverify your contact's identity -prefs.label=OTR Preferences +prefs.label=OTR விரà¯à®ªà¯à®ªà®à¯à®à®³à¯ alert.start=Attempting to start a private conversation with %S. alert.refresh=Attempting to refresh the private conversation with %S. alert.gone_insecure=Private conversation with %S ended. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/exoneratorproperties] Update translations for exoneratorproperties
commit cce203ffe463fe8e77ec44ac8ab348e26445d5ba Author: Translation commit bot Date: Wed Dec 20 15:20:37 2017 + Update translations for exoneratorproperties --- nl/exonerator.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl/exonerator.properties b/nl/exonerator.properties index c1a03a1ba..6d499a7cf 100644 --- a/nl/exonerator.properties +++ b/nl/exonerator.properties @@ -19,8 +19,8 @@ summary.invalidparams.invalidip.title=Ongeldige IP-adresparameter summary.invalidparams.invalidip.body=Sorry, %s is geen geldige parameter. De verwachte IP-adresformaten zijn %s of %s. summary.invalidparams.invalidtimestamp.title=Ongeldige datumparameter summary.invalidparams.invalidtimestamp.body=Sorry, %s is geen geldige datum. Het verwachte datumformaat is %s. -summary.invalidparams.timestamptoorecent.title=Date parameter too recent -summary.invalidparams.timestamptoorecent.body=The database may not yet contain enough data to correctly answer this request. The latest accepted data is the day before yesterday. Please repeat your search on another day. +summary.invalidparams.timestamptoorecent.title=Datum parameter te recent +summary.invalidparams.timestamptoorecent.body=De database bevat mogelijk nog niet voldoende gegevens om deze aanvraag correct te beantwoorden. De laatst geaccepteerde gegevens zijn eergisteren. Herhaal uw zoekopdracht op een andere dag. summary.serverproblem.nodata.title=Serverprobleem summary.serverproblem.nodata.body.text=De database bezit geen gegevens voor de opgevraagde datum. Probeer het later opnieuw. Als dit vaker gebeurt, %s! summary.serverproblem.nodata.body.link=laat het ons weten ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/exoneratorproperties_completed] Update translations for exoneratorproperties_completed
commit 651f915307531a65fac895c2ec2eac82aaca885f Author: Translation commit bot Date: Wed Dec 20 15:20:42 2017 + Update translations for exoneratorproperties_completed --- nl/exonerator.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nl/exonerator.properties b/nl/exonerator.properties index 18ffcf2f7..6d499a7cf 100644 --- a/nl/exonerator.properties +++ b/nl/exonerator.properties @@ -19,6 +19,8 @@ summary.invalidparams.invalidip.title=Ongeldige IP-adresparameter summary.invalidparams.invalidip.body=Sorry, %s is geen geldige parameter. De verwachte IP-adresformaten zijn %s of %s. summary.invalidparams.invalidtimestamp.title=Ongeldige datumparameter summary.invalidparams.invalidtimestamp.body=Sorry, %s is geen geldige datum. Het verwachte datumformaat is %s. +summary.invalidparams.timestamptoorecent.title=Datum parameter te recent +summary.invalidparams.timestamptoorecent.body=De database bevat mogelijk nog niet voldoende gegevens om deze aanvraag correct te beantwoorden. De laatst geaccepteerde gegevens zijn eergisteren. Herhaal uw zoekopdracht op een andere dag. summary.serverproblem.nodata.title=Serverprobleem summary.serverproblem.nodata.body.text=De database bezit geen gegevens voor de opgevraagde datum. Probeer het later opnieuw. Als dit vaker gebeurt, %s! summary.serverproblem.nodata.body.link=laat het ons weten ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Prepare for 1.0.3 release.
commit d8e8c3ddae01abe5b7f84ee4603538a9792977dc Author: Karsten Loesing Date: Wed Dec 20 15:28:35 2017 +0100 Prepare for 1.0.3 release. --- CERT | 21 + CHANGELOG.md | 9 + build.xml| 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/CERT b/CERT new file mode 100644 index 000..ca92db0 --- /dev/null +++ b/CERT @@ -0,0 +1,21 @@ +-BEGIN CERTIFICATE- +MIIDaTCCAlGgAwIBAgIEPrK+4DANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV +UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU +b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTcx +MTE3MTA0MDQ5WhcNMTgwMjE1MTA0MDQ5WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE +CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj +dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU +6aTpAjDMeaT4ctUwxH4+56Sbcf/wB0vEFBbX8MyRd1eY02PKwMVJ6VBhjOQcIlrd +Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE +MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD +oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX +lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud +DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAIqRy +T4uMqw1WwZ8CtJx5kSs/or+5025bGK6V2dY/jYapZcbyG7sq3KVFAqLik8Yn7a0D +dfbmtR7r2jbkWhYppa7MGSQ6SMG6nxas05l8yf9ShDnNLtJoay8JyGPeucaFyEwV +VxwN9/I4M4chrrvBzpMB/1U3oJxlKR+nssh4w55DoUijk3vHn01+20EPU9uNJrsr +mXhcrJLU/4R952ZMLxtiBfNP7vaxLpQctNqZxEfa9/rm0pLlfd2t62BWf8kkGqEy +Ke4WdNpQwk3WKjFlKWcvsF6ztJJlwA+qHk4IB9PynVRNggWimBrxWigbeBL8qpML +A5xMtX/MHDXreWGaKA== +-END CERTIFICATE- diff --git a/CHANGELOG.md b/CHANGELOG.md index 3eef58f..5f4adf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Changes in version 1.0.3 - 2017-12-20 + + * Major changes + - Use an embedded Jetty. + - Use metrics-base as build environment. + - Add metrics timeline events underneath graphs. + - Replace broken SVGs with higher-resolution PNGs. + + # Changes in version 1.0.2 - 2017-10-04 * Minor changes diff --git a/build.xml b/build.xml index e948388..3e4df0a 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ - + https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Bump version to 1.0.3-dev.
commit 2419892675726cd83d0e329987180338f42a3191 Author: Karsten Loesing Date: Wed Dec 20 16:35:47 2017 +0100 Bump version to 1.0.3-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 3e4df0a..01499b9 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ - + https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.2'
commit 3bc580633968ab38ddecb86c866bf95d116afccb Merge: 8e5450b75 0a1b1430c Author: Nick Mathewson Date: Wed Dec 20 10:39:38 2017 -0500 Merge branch 'maint-0.3.2' src/test/test_hs_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
commit 2824413f40e20bb1c02eb6e180208eca203645f3 Merge: 64c88c719 0a1b1430c Author: Nick Mathewson Date: Wed Dec 20 10:39:38 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/test/test_hs_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Update the unit tests to reflect the change of 24425
commit 0a1b1430c87824d5f5922827b6ca770a43e709ac
Author: Nick Mathewson
Date: Wed Dec 20 10:39:19 2017 -0500
Update the unit tests to reflect the change of 24425
---
src/test/test_hs_common.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index b435a93e3..b9b76d15b 100644
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -1053,7 +1053,7 @@ are_responsible_hsdirs_equal(void)
{
int count = 0;
tt_int_op(smartlist_len(client_responsible_hsdirs), OP_EQ, 6);
- tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 6);
+ tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 8);
SMARTLIST_FOREACH_BEGIN(client_responsible_hsdirs,
const routerstatus_t *, c_rs) {
@@ -1415,7 +1415,7 @@ run_reachability_scenario(const reachability_cfg_t *cfg,
int num_scenario)
cfg->client_fetch_next_desc, 0,
service_responsible_hsdirs);
cleanup_nodelist();
- tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 6);
+ tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 8);
UNMOCK(networkstatus_get_latest_consensus);
UNMOCK(networkstatus_get_live_consensus);
@@ -1605,7 +1605,7 @@ helper_test_hsdir_sync(networkstatus_t *ns,
/* Cleanup right now so we don't memleak on error. */
cleanup_nodelist();
/* Check that previous hsdirs were populated */
- tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 6);
+ tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 8);
/* 3) Initialize client time */
helper_set_consensus_and_system_time(ns, client_position);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Update Onionoo specification for version 5.0.
commit ca85dbd8cc479556ae56a420e213619468933443 Author: Karsten Loesing Date: Wed Dec 20 11:36:56 2017 +0100 Update Onionoo specification for version 5.0. --- src/main/resources/web/jsps/onionoo.jsp | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/resources/web/jsps/onionoo.jsp b/src/main/resources/web/jsps/onionoo.jsp index 8f9bfad..b31b469 100644 --- a/src/main/resources/web/jsps/onionoo.jsp +++ b/src/main/resources/web/jsps/onionoo.jsp @@ -292,9 +292,8 @@ Extended the "version" parameter to bridges, added a 28, 2017. # 5.0 -(scheduled, but not deployed yet!): Remove $ from fingerprints in -"effective_family", "alleged_family", and "indirect_family" fields, to -be deployed after December 17, 2017. +Removed the $ from fingerprints in fields "effective_family", "alleged_family", +and "indirect_family" on December 20, 2017. # @@ -1496,8 +1495,7 @@ These relays are part of this relay's family and they consider this relay to be part of their family. Omitted if empty or if descriptor containing this information cannot be found. -Protocol version 5.0 is going to -remove the $ prefix from fingerprints, to be deployed after December 17, +Removed the $ prefix from fingerprintson December 20, 2017. @@ -1515,8 +1513,7 @@ These relays are part of this relay's family but they don't consider this relay to be part of their family. Omitted if empty or if descriptor containing this information cannot be found. -Protocol version 5.0 is going to -remove the $ prefix from fingerprints, to be deployed after December 17, +Removed the $ prefix from fingerprintson December 20, 2017. @@ -1533,8 +1530,7 @@ mutual family relationship with this relay but that can be reached by following effective, mutual family relationships starting at this relay. Omitted if empty or if descriptor containing this information cannot be found. -Protocol version 5.0 is going to -remove the $ prefix from fingerprints, to be deployed after December 17, +Removed the $ prefix from fingerprintson December 20, 2017. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Update the unit tests to reflect the change of 24425
commit 0a1b1430c87824d5f5922827b6ca770a43e709ac
Author: Nick Mathewson
Date: Wed Dec 20 10:39:19 2017 -0500
Update the unit tests to reflect the change of 24425
---
src/test/test_hs_common.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index b435a93e3..b9b76d15b 100644
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -1053,7 +1053,7 @@ are_responsible_hsdirs_equal(void)
{
int count = 0;
tt_int_op(smartlist_len(client_responsible_hsdirs), OP_EQ, 6);
- tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 6);
+ tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 8);
SMARTLIST_FOREACH_BEGIN(client_responsible_hsdirs,
const routerstatus_t *, c_rs) {
@@ -1415,7 +1415,7 @@ run_reachability_scenario(const reachability_cfg_t *cfg,
int num_scenario)
cfg->client_fetch_next_desc, 0,
service_responsible_hsdirs);
cleanup_nodelist();
- tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 6);
+ tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 8);
UNMOCK(networkstatus_get_latest_consensus);
UNMOCK(networkstatus_get_live_consensus);
@@ -1605,7 +1605,7 @@ helper_test_hsdir_sync(networkstatus_t *ns,
/* Cleanup right now so we don't memleak on error. */
cleanup_nodelist();
/* Check that previous hsdirs were populated */
- tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 6);
+ tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 8);
/* 3) Initialize client time */
helper_set_consensus_and_system_time(ns, client_position);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Update the unit tests to reflect the change of 24425
commit 0a1b1430c87824d5f5922827b6ca770a43e709ac
Author: Nick Mathewson
Date: Wed Dec 20 10:39:19 2017 -0500
Update the unit tests to reflect the change of 24425
---
src/test/test_hs_common.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index b435a93e3..b9b76d15b 100644
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -1053,7 +1053,7 @@ are_responsible_hsdirs_equal(void)
{
int count = 0;
tt_int_op(smartlist_len(client_responsible_hsdirs), OP_EQ, 6);
- tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 6);
+ tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 8);
SMARTLIST_FOREACH_BEGIN(client_responsible_hsdirs,
const routerstatus_t *, c_rs) {
@@ -1415,7 +1415,7 @@ run_reachability_scenario(const reachability_cfg_t *cfg,
int num_scenario)
cfg->client_fetch_next_desc, 0,
service_responsible_hsdirs);
cleanup_nodelist();
- tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 6);
+ tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 8);
UNMOCK(networkstatus_get_latest_consensus);
UNMOCK(networkstatus_get_live_consensus);
@@ -1605,7 +1605,7 @@ helper_test_hsdir_sync(networkstatus_t *ns,
/* Cleanup right now so we don't memleak on error. */
cleanup_nodelist();
/* Check that previous hsdirs were populated */
- tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 6);
+ tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 8);
/* 3) Initialize client time */
helper_set_consensus_and_system_time(ns, client_position);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add remove file function and remove ephemeral files.
commit 61c721f1458c9779541aa6e07e5e59404cf31dc4
Author: Fernando Fernandez Mancera
Date: Fri Dec 15 17:01:22 2017 +0100
Add remove file function and remove ephemeral files.
Adding tor_remove_file(filename) and refactoring tor_cleanup().
Removing CookieAuthFile and ExtORPortCookieAuthFile when tor_cleanup() is
called.
Fixes #23271.
Signed-off-by: Fernando Fernandez Mancera
---
changes/ticket23271 | 6 ++
src/or/main.c | 33 -
src/or/main.h | 2 ++
3 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/changes/ticket23271 b/changes/ticket23271
new file mode 100644
index 0..42d5921a7
--- /dev/null
+++ b/changes/ticket23271
@@ -0,0 +1,6 @@
+ o Code simplification and refactoring:
+- Separate the function that deletes ephemeral files when Tor stops
+ gracefully.
+ o Minor features (cleanup):
+- Tor now deletes the CookieAuthFile and ExtORPortCookieAuthFile when it
+ stops. Closes ticket 23271.
diff --git a/src/or/main.c b/src/or/main.c
index c340e4128..9d9391fc0 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3303,6 +3303,18 @@ tor_free_all(int postfork)
}
}
+/** Remove the specified file. */
+void
+tor_remove_file(const char *filename)
+{
+ if (file_status(filename) == FN_FILE) {
+if (tor_unlink(filename) != 0) {
+ log_warn(LD_FS, "Couldn't unlink %s: %s",
+ filename, strerror(errno));
+}
+ }
+}
+
/** Do whatever cleanup is necessary before shutting Tor down. */
void
tor_cleanup(void)
@@ -3312,19 +3324,14 @@ tor_cleanup(void)
time_t now = time(NULL);
/* Remove our pid file. We don't care if there was an error when we
* unlink, nothing we could do about it anyways. */
-if (options->PidFile) {
- if (unlink(options->PidFile) != 0) {
-log_warn(LD_FS, "Couldn't unlink pid file %s: %s",
- options->PidFile, strerror(errno));
- }
-}
-if (options->ControlPortWriteToFile) {
- if (unlink(options->ControlPortWriteToFile) != 0) {
-log_warn(LD_FS, "Couldn't unlink control port file %s: %s",
- options->ControlPortWriteToFile,
- strerror(errno));
- }
-}
+tor_remove_file(options->PidFile);
+/* Remove control port file */
+tor_remove_file(options->ControlPortWriteToFile);
+/* Remove cookie authentication file */
+tor_remove_file(get_controller_cookie_file_name());
+/* Remove Extended ORPort cookie authentication file */
+tor_remove_file(get_ext_or_auth_cookie_file_name());
+
if (accounting_is_enabled(options))
accounting_record_bandwidth_usage(now, get_or_state());
or_state_mark_dirty(get_or_state(), 0); /* force an immediate save. */
diff --git a/src/or/main.h b/src/or/main.h
index 132ab12bb..d05800f93 100644
--- a/src/or/main.h
+++ b/src/or/main.h
@@ -71,6 +71,8 @@ int try_locking(const or_options_t *options, int
err_if_locked);
int have_lockfile(void);
void release_lockfile(void);
+void tor_remove_file(const char *filename);
+
void tor_cleanup(void);
void tor_free_all(int postfork);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] expand documentation on tor_remove_file
commit c99ec36defadf763034b82107f6168987668862f
Author: Nick Mathewson
Date: Wed Dec 20 10:43:27 2017 -0500
expand documentation on tor_remove_file
---
src/or/main.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/or/main.c b/src/or/main.c
index f4050d3a5..2c8dfae2f 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3397,7 +3397,10 @@ tor_free_all(int postfork)
}
}
-/** Remove the specified file. */
+/**
+ * Remove the specified file, and log a warning if the operation fails for
+ * any reason other than the file not existing.
+ */
void
tor_remove_file(const char *filename)
{
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'ffmancera/github/bug23271'
commit 18543c2c9b7b2a2b23b25b2e64262d60a5c448c5 Merge: 3bc580633 61c721f14 Author: Nick Mathewson Date: Wed Dec 20 10:40:32 2017 -0500 Merge remote-tracking branch 'ffmancera/github/bug23271' changes/ticket23271 | 6 ++ src/or/main.c | 33 - src/or/main.h | 2 ++ 3 files changed, 28 insertions(+), 13 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Remove pre-unlink check tor_remove_file; check errno instead.
commit 4b7b305bf0513a9b010ab0fc75060dce8d29206a
Author: Nick Mathewson
Date: Wed Dec 20 10:42:02 2017 -0500
Remove pre-unlink check tor_remove_file; check errno instead.
This removes a time-of-check/time-of-use issue, though in this case
it would probably be harmless.
---
src/or/main.c | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/or/main.c b/src/or/main.c
index e66167fe4..f4050d3a5 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3401,11 +3401,9 @@ tor_free_all(int postfork)
void
tor_remove_file(const char *filename)
{
- if (file_status(filename) == FN_FILE) {
-if (tor_unlink(filename) != 0) {
- log_warn(LD_FS, "Couldn't unlink %s: %s",
+ if (tor_unlink(filename) != 0 && errno != ENOENT) {
+log_warn(LD_FS, "Couldn't unlink %s: %s",
filename, strerror(errno));
-}
}
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/mat-gui] Update translations for mat-gui
commit 9951dd26dfc18bc78ffc310e82b90b3d3f43eaec Author: Translation commit bot Date: Wed Dec 20 15:46:28 2017 + Update translations for mat-gui --- ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ta.po b/ta.po index 58886c2fb..7ec7bfe19 100644 --- a/ta.po +++ b/ta.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2017-10-08 18:01+\n" +"PO-Revision-Date: 2017-12-20 15:39+\n" "Last-Translator: Senthil Kumar \n" "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
