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

[tor-browser-build/master] Picking up new rbm commit
by gk＠torproject.org 07 Sep '17

07 Sep '17

commit 6690281b7eec547ee4c977ae9fc89728f63c5016 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 7 10:30:57 2017 +0000 Picking up new rbm commit --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 0f5857b..296fba7 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 0f5857bb0486187fcd35c553dec9ae6d3657a98c +Subproject commit 296fba79fca70b922cc6eb2be8b830d8074b70e4

1 0

[rbm/master] Bug 23382: create tmp_dir if it does not exist
by gk＠torproject.org 07 Sep '17

07 Sep '17

commit 296fba79fca70b922cc6eb2be8b830d8074b70e4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 6 16:54:07 2017 +0200 Bug 23382: create tmp_dir if it does not exist --- lib/RBM.pm | 21 +++++++++++++-------- lib/RBM/DefaultConfig.pm | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index df29a01..b14909f 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -259,11 +259,17 @@ sub exit_error { exit (exists $_[1] ? $_[1] : 1); } +sub get_tmp_dir { + my ($project, $options) = @_; + my $tmp_dir = project_config($project, 'tmp_dir', $options); + make_path($tmp_dir); + return $tmp_dir; +} + sub set_git_gpg_wrapper { my ($project) = @_; my $w = project_config($project, 'gpg_wrapper'); - my (undef, $tmp) = File::Temp::tempfile(DIR => - project_config($project, 'tmp_dir')); + my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project)); write_file($tmp, $w); chmod 0700, $tmp; system('git', 'config', 'gpg.program', $tmp) == 0 @@ -314,7 +320,7 @@ sub git_tag_sign_id { sub file_sign_id { my ($project, $options) = @_; my (undef, $gpg_wrapper) = File::Temp::tempfile(DIR => - project_config($project, 'tmp_dir', $options)); + get_tmp_dir($project, $options)); write_file($gpg_wrapper, project_config($project, 'gpg_wrapper', $options)); chmod 0700, $gpg_wrapper; my ($stdout, $stderr, $success, $exit_code) = @@ -445,8 +451,7 @@ sub run_script { $f //= \&capture_exec; my @res; if ($cmd =~ m/^#/) { - my (undef, $tmp) = File::Temp::tempfile(DIR => - project_config($project, 'tmp_dir')); + my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project)); write_file($tmp, $cmd); chmod 0700, $tmp; @res = $f->($tmp); @@ -540,7 +545,7 @@ sub maketar { || exit_error 'Error running git archive.'; if (project_config($project, 'git_submodule', $options)) { my $tmpdir = File::Temp->newdir( - project_config($project, 'tmp_dir', $options) . '/rbm-XXXXX'); + get_tmp_dir($project, $options) . '/rbm-XXXXX'); my ($stdout, $stderr, $success, $exit_code) = capture_exec('git', 'checkout', $commit_hash); exit_error "Cannot checkout $commit_hash: $stderr" unless $success; @@ -952,7 +957,7 @@ sub build_run { my $old_cwd = getcwd; my $srcdir = project_config($project, 'build_srcdir', $options); my $use_srcdir = $srcdir; - my $tmpdir = File::Temp->newdir(project_config($project, 'tmp_dir', $options) + my $tmpdir = File::Temp->newdir(get_tmp_dir($project, $options) . '/rbm-XXXXX'); my @cfiles; if ($use_srcdir) { @@ -1119,7 +1124,7 @@ sub publish { project_config($project, 'publish', { error_if_undef => 1 }); my $publish_src_dir = project_config($project, 'publish_src_dir'); if (!$publish_src_dir) { - $publish_src_dir = File::Temp->newdir(project_config($project, 'tmp_dir') + $publish_src_dir = File::Temp->newdir(get_tmp_dir($project) . '/rbm-XXXXXX'); build_pkg($project, {output_dir => $publish_src_dir}); } diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index b1f97cb..d0d893a 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -106,7 +106,7 @@ sub rbm_tmp_dir { my ($project, $options) = @_; CORE::state $rbm_tmp_dir; return $rbm_tmp_dir->dirname if $rbm_tmp_dir; - my $tmp_dir = RBM::project_config($project, 'tmp_dir', $options) + my $tmp_dir = RBM::get_tmp_dir($project, $options) || RBM::exit_error('No tmp_dir specified'); $rbm_tmp_dir = File::Temp->newdir(TEMPLATE => 'rbm-XXXXXX', DIR => $tmp_dir);

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 07 Sep '17

07 Sep '17

commit 6a20c62ac4b1bd2f8018c62213f5648d45d7b023 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 7 10:15:39 2017 +0000 Update translations for https_everywhere_completed --- el/https-everywhere.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/el/https-everywhere.properties b/el/https-everywhere.properties index 507fcbd0b..753ee1fbf 100644 --- a/el/https-everywhere.properties +++ b/el/https-everywhere.properties @@ -1,8 +1,8 @@ https-everywhere.menu.globalEnable = Ενεργοποίηση του HTTPS Everywhere -https-everywhere.menu.globalDisable = Απενεργοποίηση του HTTPS Everywhere +https-everywhere.menu.globalDisable = Απενεργοποίηση του HTTPS Εverywhere https-everywhere.menu.enableDisable = Ενεργοποίηση / Απενεργοποίηση των κανόνων https-everywhere.menu.noRules = (Δεν υπάρχουν κανόνες για αυτή την σελίδα) https-everywhere.menu.unknownRules = (Κανόνες για αυτή τη σελίδα: Άγνωστοι) -https-everywhere.toolbar.hint = Το HTTPS Everywhere ειναι τωρα ενεργοποιημενο. Μπορείτε να το αλλάξετε με βάση την τοποθεσία ανά τοποθεσία, κάνοντας κλικ στο εικονίδιο στη γραμμή διευθύνσεων. +https-everywhere.toolbar.hint = Το HTTPS Everywhere είναι τώρα ενεργοποιημένο. Μπορείτε να το αλλάξετε με βάση την τοποθεσία ανά τοποθεσία, κάνοντας κλικ στο εικονίδιο στη γραμμή διευθύνσεων. https-everywhere.migration.notification0 = Αυτή η ενημέρωση επαναφέρει τις ρυθμίσεις κανόνων του HTTPS Everywhere στις προεπιλεγμένες τιμές, με σκοπό να εφαρμοστεί μια κρίσιμη διόρθωση. -https-everywhere.menu.ruleset-tests = Εκτέλεση HTTPS Παντού Δοκιμές Κανόνων +https-everywhere.menu.ruleset-tests = Εκτέλεση Δοκιμών Κανόνων του HTTPS Everywhere

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 07 Sep '17

07 Sep '17

commit df902e1e626588f88c967eada3b20bcd3237ba81 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 7 10:15:32 2017 +0000 Update translations for https_everywhere --- el/https-everywhere.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/el/https-everywhere.properties b/el/https-everywhere.properties index 507fcbd0b..753ee1fbf 100644 --- a/el/https-everywhere.properties +++ b/el/https-everywhere.properties @@ -1,8 +1,8 @@ https-everywhere.menu.globalEnable = Ενεργοποίηση του HTTPS Everywhere -https-everywhere.menu.globalDisable = Απενεργοποίηση του HTTPS Everywhere +https-everywhere.menu.globalDisable = Απενεργοποίηση του HTTPS Εverywhere https-everywhere.menu.enableDisable = Ενεργοποίηση / Απενεργοποίηση των κανόνων https-everywhere.menu.noRules = (Δεν υπάρχουν κανόνες για αυτή την σελίδα) https-everywhere.menu.unknownRules = (Κανόνες για αυτή τη σελίδα: Άγνωστοι) -https-everywhere.toolbar.hint = Το HTTPS Everywhere ειναι τωρα ενεργοποιημενο. Μπορείτε να το αλλάξετε με βάση την τοποθεσία ανά τοποθεσία, κάνοντας κλικ στο εικονίδιο στη γραμμή διευθύνσεων. +https-everywhere.toolbar.hint = Το HTTPS Everywhere είναι τώρα ενεργοποιημένο. Μπορείτε να το αλλάξετε με βάση την τοποθεσία ανά τοποθεσία, κάνοντας κλικ στο εικονίδιο στη γραμμή διευθύνσεων. https-everywhere.migration.notification0 = Αυτή η ενημέρωση επαναφέρει τις ρυθμίσεις κανόνων του HTTPS Everywhere στις προεπιλεγμένες τιμές, με σκοπό να εφαρμοστεί μια κρίσιμη διόρθωση. -https-everywhere.menu.ruleset-tests = Εκτέλεση HTTPS Παντού Δοκιμές Κανόνων +https-everywhere.menu.ruleset-tests = Εκτέλεση Δοκιμών Κανόνων του HTTPS Everywhere

1 0

[collector/master] Changed test data, wich makes some tests fail.
by karsten＠torproject.org 07 Sep '17

07 Sep '17

commit 1042a7683c913a0e30d998fa9f7900d97046ac40 Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Aug 18 13:03:04 2017 +0000 Changed test data, wich makes some tests fail. Part of task-23215. --- src/test/resources/2016-09-20-13-00-00-consensus | 2 +- ...03580E3B66A1707A00E60F2D15B-60ADC6BEC262AE921A1037D54C8A3976367DBE87 | 2 +- src/test/resources/2016-10-02-17-00-00-consensus-microdesc | 2 +- .../resources/20160920-063816-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/resources/2016-09-20-13-00-00-consensus b/src/test/resources/2016-09-20-13-00-00-consensus index 6511263..a61a811 100644 --- a/src/test/resources/2016-09-20-13-00-00-consensus +++ b/src/test/resources/2016-09-20-13-00-00-consensus @@ -1,4 +1,4 @@ -@type network-status-consensus-3 1.0 +@type network-status-consensus-3 1.17 network-status-version 3 vote-status consensus consensus-method 20 diff --git a/src/test/resources/2016-09-20-13-00-00-vote-49015F787433103580E3B66A1707A00E60F2D15B-60ADC6BEC262AE921A1037D54C8A3976367DBE87 b/src/test/resources/2016-09-20-13-00-00-vote-49015F787433103580E3B66A1707A00E60F2D15B-60ADC6BEC262AE921A1037D54C8A3976367DBE87 index c65ff66..02ee2bc 100644 --- a/src/test/resources/2016-09-20-13-00-00-vote-49015F787433103580E3B66A1707A00E60F2D15B-60ADC6BEC262AE921A1037D54C8A3976367DBE87 +++ b/src/test/resources/2016-09-20-13-00-00-vote-49015F787433103580E3B66A1707A00E60F2D15B-60ADC6BEC262AE921A1037D54C8A3976367DBE87 @@ -1,4 +1,4 @@ -@type network-status-vote-3 1.0 +@type network-status-vote-3 1.17 network-status-version 3 vote-status vote consensus-methods 13 14 15 16 17 18 19 20 22 diff --git a/src/test/resources/2016-10-02-17-00-00-consensus-microdesc b/src/test/resources/2016-10-02-17-00-00-consensus-microdesc index 705f01b..563708f 100644 --- a/src/test/resources/2016-10-02-17-00-00-consensus-microdesc +++ b/src/test/resources/2016-10-02-17-00-00-consensus-microdesc @@ -1,4 +1,4 @@ -@type network-status-microdesc-consensus-3 1.0 +@type network-status-microdesc-consensus-3 1.17 network-status-version 3 microdesc vote-status consensus consensus-method 20 diff --git a/src/test/resources/20160920-063816-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1 b/src/test/resources/20160920-063816-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1 index c85732b..6171b44 100644 --- a/src/test/resources/20160920-063816-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1 +++ b/src/test/resources/20160920-063816-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1 @@ -1,4 +1,4 @@ -@type bridge-network-status 1.2 +@type bridge-network-status 1.17 published 2016-09-20 06:38:16 flag-thresholds stable-uptime=1293451 stable-mtbf=1209559 fast-speed=55000 guard-wfu=98.000% guard-tk=691200 guard-bw-inc-exits=336000 guard-bw-exc-exits=337000 enough-mtbf=1 ignoring-advertised-bws=0 fingerprint 1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1

1 0

[collector/master] Keep annotations of given descriptors.
by karsten＠torproject.org 07 Sep '17

07 Sep '17

commit 68f5301bd1cf8b10fcae0a2d7e924cc87093a97c Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Aug 18 13:03:05 2017 +0000 Keep annotations of given descriptors. Makes test pass again and implements task-23215. Changes a test descriptor to contain a second annotation. --- CHANGELOG.md | 8 ++++++++ .../collector/persist/DescriptorPersistence.java | 14 ++++++++++++-- src/test/resources/bridge-2016-10-02-08-09-00-extra-infos | 8 ++++++++ src/test/resources/moria-1048576-2016-10-05.tpf | 2 +- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6a8bf6..ada02ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Changes in version 1.?.? - 2017-??-?? + + * Medium changes + - When synchronizing descriptors from another CollecTor instance, + keep annotations provided by the descriptor and only add the + default annotation, when there was none. + + # Changes in version 1.2.1 - 2017-08-17 * Medium changes diff --git a/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java b/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java index d54392d..e7bce5b 100644 --- a/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java +++ b/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java @@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; +import java.util.List; public abstract class DescriptorPersistence<T extends Descriptor> { @@ -32,9 +33,18 @@ public abstract class DescriptorPersistence<T extends Descriptor> { protected String recentPath; /** Initializes the paths for storing descriptors of type <code>T</code>. */ - protected DescriptorPersistence(T desc, byte[] annotation) { + protected DescriptorPersistence(T desc, byte[] defaultAnnotation) { this.desc = desc; - this.annotation = annotation; + List<String> annotations = desc.getAnnotations(); + if (annotations.isEmpty()) { + this.annotation = defaultAnnotation; + } else { + StringBuilder sb = new StringBuilder(""); + for (String annotation : annotations) { + sb.append(annotation).append("\n"); + } + this.annotation = sb.toString().getBytes(); + } } /** Stores the descriptor to all locations. diff --git a/src/test/resources/bridge-2016-10-02-08-09-00-extra-infos b/src/test/resources/bridge-2016-10-02-08-09-00-extra-infos index f485178..7eea3f8 100644 --- a/src/test/resources/bridge-2016-10-02-08-09-00-extra-infos +++ b/src/test/resources/bridge-2016-10-02-08-09-00-extra-infos @@ -1,4 +1,5 @@ @type bridge-extra-info 1.3 +@some-future annotation extra-info DragonBridge A8D07F92DF78FA2C208FA6675B56E0A7BB750794 master-key-ed25519 jBoYHwHIP9vplYgonlMUFJxND0QMEBqCnL2cEe2NbYc published 2016-10-02 06:09:10 @@ -144,6 +145,13 @@ bridge-ip-transports <OR>=8,obfs3=8,obfs4=48 router-digest-sha256 b/PO7nPdxo+we9Tr/dQt2hAyu1TbtAWdjzac3CWYzpg router-digest BCFCBB38B15E9B500B1A6E9B0BCBBCE858660F17 @type bridge-extra-info 1.3 +@many more annotations +@one +@two +@three +@four +@five and +@last and final extra-info Unnamed 1283EDA3E80CA2D485CCFEDB9715392396DFAD29 master-key-ed25519 5GUbxrSHFtj6QjHHx5ovS2gAh8/ZjtbjU4yjULS0l0s published 2016-10-02 06:09:43 diff --git a/src/test/resources/moria-1048576-2016-10-05.tpf b/src/test/resources/moria-1048576-2016-10-05.tpf index ea05a13..780fa33 100644 --- a/src/test/resources/moria-1048576-2016-10-05.tpf +++ b/src/test/resources/moria-1048576-2016-10-05.tpf @@ -4,7 +4,7 @@ BUILDTIMES=0.658563137054,1.08981704712,1.52948904037 CIRC_ID=1166 CONNECT=14756 BUILDTIMES=0.696699857712,0.833825826645,0.981504917145 CIRC_ID=1172 CONNECT=1475627521.53 DATACOMPLETE=1475627523.30 DATAPERC10=1475627522.45 DATAPERC20=1475627522.57 DATAPERC30=1475627522.68 DATAPERC40=1475627522.73 DATAPERC50=1475627522.85 DATAPERC60=1475627522.93 DATAPERC70=1475627523.04 DATAPERC80=1475627523.05 DATAPERC90=1475627523.21 DATAREQUEST=1475627521.87 DATARESPONSE=1475627522.12 DIDTIMEOUT=0 FILESIZE=1048576 LAUNCH=1475626321.13 NEGOTIATE=1475627521.53 PATH=$B411027C926A9BFFCF7DA91E3CAF1856A321EFFD,$02928855BFAD787F8B363F21860D1E7D156E0655,$95DA61AEF23A6C851028C1AA88AD8593F659E60F QUANTILE=0.800000 READBYTES=1048873 REQUEST=1475627521.53 RESPONSE=1475627521.87 SOCKET=1475627521.53 SOURCE=moria START=1475627521.53 TIMEOUT=1500 USED_AT=1475627523.30 USED_BY=2771 WRITEBYTES=74 @type torperf 1.0 BUILDTIMES=0.574013948441,0.694298028946,0.844352960587 CIRC_ID=1173 CONNECT=1475629321.12 DATACOMPLETE=1475629323.34 DATAPERC10=1475629322.05 DATAPERC20=1475629322.18 DATAPERC30=1475629322.26 DATAPERC40=1475629322.44 DATAPERC50=1475629322.58 DATAPERC60=1475629322.76 DATAPERC70=1475629322.90 DATAPERC80=1475629323.13 DATAPERC90=1475629323.24 DATAREQUEST=1475629321.47 DATARESPONSE=1475629321.71 DIDTIMEOUT=0 FILESIZE=1048576 LAUNCH=1475628121.66 NEGOTIATE=1475629321.12 PATH=$20462CBA5DA4C2D963567D17D0B7249718114A68,$480CCC94CEA04D2DEABC0D7373868E245D4C2AE2,$E1E922A20AF608728824A620BADC6EFC8CB8C2B8 QUANTILE=0.800000 READBYTES=1048873 REQUEST=1475629321.12 RESPONSE=1475629321.47 SOCKET=1475629321.12 SOURCE=moria START=1475629321.12 TIMEOUT=1500 USED_AT=1475629323.35 USED_BY=2773 WRITEBYTES=74 -@type torperf 1.0 +@type torperf 0.9 BUILDTIMES=0.573640108109,0.690929174423,0.906491041183 CIRC_ID=1175 CONNECT=1475631121.93 DATACOMPLETE=1475631124.21 DATAPERC10=1475631122.88 DATAPERC20=1475631123.01 DATAPERC30=1475631123.11 DATAPERC40=1475631123.30 DATAPERC50=1475631123.40 DATAPERC60=1475631123.55 DATAPERC70=1475631123.69 DATAPERC80=1475631123.80 DATAPERC90=1475631123.97 DATAREQUEST=1475631122.27 DATARESPONSE=1475631122.54 DIDTIMEOUT=0 FILESIZE=1048576 LAUNCH=1475629921.18 NEGOTIATE=1475631121.93 PATH=$183C2E314DD677D28CDB6839A0204C4276F6E32D,$360911BEBE036BE7D0BA45B8FC07FF50119EB5B0,$47BAD834309368640EA066913DF741AF413EDE5E QUANTILE=0.800000 READBYTES=1048873 REQUEST=1475631121.93 RESPONSE=1475631122.27 SOCKET=1475631121.93 SOURCE=moria START=1475631121.93 TIMEOUT=1500 USED_AT=1475631124.22 USED_BY=2776 WRITEBYTES=74 @type torperf 1.0 BUILDTIMES=0.578256845474,0.696436882019,0.842072963715 CIRC_ID=1176 CONNECT=1475632921.76 DATACOMPLETE=1475632923.47 DATAPERC10=1475632922.60 DATAPERC20=1475632922.69 DATAPERC30=1475632922.78 DATAPERC40=1475632922.90 DATAPERC50=1475632922.94 DATAPERC60=1475632923.03 DATAPERC70=1475632923.11 DATAPERC80=1475632923.23 DATAPERC90=1475632923.32 DATAREQUEST=1475632922.05 DATARESPONSE=1475632922.29 DIDTIMEOUT=0 FILESIZE=1048576 LAUNCH=1475631721.73 NEGOTIATE=1475632921.76 PATH=$888933294902B310106CF68C012ECDD110114452,$7961C9991F022C8A363FD440CA395D47DB5D44D5,$F65E0196C94DFFF48AFBF2F5F9E3E19AAE583FD0 QUANTILE=0.800000 READBYTES=1048873 REQUEST=1475632921.76 RESPONSE=1475632922.05 SOCKET=1475632921.76 SOURCE=moria START=1475632921.76 TIMEOUT=1500 USED_AT=1475632923.48 USED_BY=2799 WRITEBYTES=74

1 0

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

07 Sep '17

commit bd1798cc5d423bd9205498a82e52466e4dc5419d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Sep 7 11:56:33 2017 +0200 Update news.json to version 126 of doc/MetricsTimeline. --- website/src/main/resources/etc/news.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index d088f9c..2a8626d 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -1139,6 +1139,17 @@ ] }, { + "start": "2017-09-01", + "protocols": [ + "obfs4" + ], + "description": "A flood of new obfs4 bridges nicknamed \"Machiavelli\".", + "links": [ + "<a href=\"https://metrics.torproject.org/networksize.html?start=2017-07-01&end=2017-0…">graph of number of bridges</a>", + "<a href=\"https://twitter.com/nusenu_/status/905580044503969792\">tweet</a>" + ] + }, + { "start": "2016-02-24", "places": [ "tm"

1 0

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

06 Sep '17

commit 69c6c6fe4ee0176e988db8b2d51c7533e5e957d2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 6 22:07:20 2017 +0200 Update news.json to version 125 of doc/MetricsTimeline. Starting with this version, place can contain zero, one, or more places. Due to the wiki page maintainer dcf, this is on purpose. We should support that by turning the string into a string array. --- .../main/java/org/torproject/metrics/web/News.java | 6 +- .../org/torproject/metrics/web/NewsServlet.java | 16 +- website/src/main/resources/etc/news.json | 199 ++++++++++++++------- 3 files changed, 153 insertions(+), 68 deletions(-) diff --git a/website/src/main/java/org/torproject/metrics/web/News.java b/website/src/main/java/org/torproject/metrics/web/News.java index 762911f..c7630ab 100644 --- a/website/src/main/java/org/torproject/metrics/web/News.java +++ b/website/src/main/java/org/torproject/metrics/web/News.java @@ -9,7 +9,7 @@ public class News { private String end; - private String place; + private String[] places; private String[] protocols; @@ -27,8 +27,8 @@ public class News { return this.end; } - String getPlace() { - return this.place; + String[] getPlaces() { + return this.places; } String[] getProtocols() { diff --git a/website/src/main/java/org/torproject/metrics/web/NewsServlet.java b/website/src/main/java/org/torproject/metrics/web/NewsServlet.java index 2e9bdb1..227f949 100644 --- a/website/src/main/java/org/torproject/metrics/web/NewsServlet.java +++ b/website/src/main/java/org/torproject/metrics/web/NewsServlet.java @@ -92,11 +92,17 @@ public class NewsServlet extends AnyServlet { if (news.getEnd() != null) { sb.append(" to ").append(news.getEnd()); } - if (news.getPlace() != null) { - if (this.countries.containsKey(news.getPlace())) { - sb.append(" ") - .append(this.countries.get(news.getPlace())).append(""); - } else { + if (news.getPlaces() != null) { + boolean appendUnknownCountry = false; + for (String place : news.getPlaces()) { + if (this.countries.containsKey(place)) { + sb.append(" ") + .append(this.countries.get(place)).append(""); + } else { + appendUnknownCountry = true; + } + } + if (appendUnknownCountry) { sb.append(" " + "Unknown country"); } diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index d679d5f..d088f9c 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -24,7 +24,9 @@ { "start": "2012-03-01", "end": "2013-08-19", - "place": "kz", + "places": [ + "kz" + ], "protocols": [ "<OR>" ], @@ -37,7 +39,9 @@ { "start": "2012-05-15", "end": "2012-12-15", - "place": "et", + "places": [ + "et" + ], "protocols": [ "<OR>" ], @@ -338,7 +342,9 @@ { "start": "2015-11-18", "end": "2015-12-10", - "place": "bd", + "places": [ + "bd" + ], "protocols": [ "<OR>", "obfs3", @@ -455,7 +461,9 @@ { "start": "2016-05-02", "end": "2016-05-03", - "place": "br", + "places": [ + "br" + ], "protocols": [ "<OR>" ], @@ -489,7 +497,9 @@ }, { "start": "2016-06-01", - "place": "kz", + "places": [ + "kz" + ], "protocols": [ "<OR>", "obfs4" @@ -501,7 +511,9 @@ }, { "start": "2016-07-15", - "place": "tr", + "places": [ + "tr" + ], "protocols": [ "<OR>" ], @@ -520,7 +532,9 @@ }, { "start": "2016-08-20", - "place": "ir", + "places": [ + "ir" + ], "protocols": [ "<OR>" ], @@ -563,7 +577,9 @@ }, { "start": "2016-09-04", - "place": "ir", + "places": [ + "ir" + ], "protocols": [ "<OR>" ], @@ -641,7 +657,9 @@ { "start": "2016-10-02", "end": "2016-10-03", - "place": "eg", + "places": [ + "eg" + ], "protocols": [ "<OR>", "relay" @@ -653,7 +671,9 @@ }, { "start": "2016-10-08", - "place": "et", + "places": [ + "et" + ], "description": "Ethiopia declares a state of emergency and implements network blocks.", "links": [ "<a href=\"https://ooni.torproject.org/post/ethiopia-report/#internet-shutdown\">OONI report</a>" @@ -662,7 +682,9 @@ { "start": "2016-10-08", "end": "2016-10-09", - "place": "tr", + "places": [ + "tr" + ], "description": "Turkey blocks storage services including Dropbox, Google Drive, OneDrive, and GitHub. Most (all?) of the blocks were rescinded the next day.", "links": [ "<a href=\"https://turkeyblocks.org/2016/10/08/google-drive-dropbox-blocked-in-turkey/\">blocking article</a>", @@ -686,7 +708,9 @@ }, { "start": "2016-10-25", - "place": "eg", + "places": [ + "eg" + ], "protocols": [ "<OR>", "relay" @@ -712,7 +736,9 @@ }, { "start": "2016-11-03", - "place": "tr", + "places": [ + "tr" + ], "description": "Turkey blocks Facebook, Twitter, YouTube, WhatsApp", "links": [ "<a href=\"https://turkeyblocks.org/2016/11/04/social-media-shutdown-turkey/\">article</a>" @@ -720,7 +746,9 @@ }, { "start": "2016-11-04", - "place": "tr", + "places": [ + "tr" + ], "description": "Turkey orders a block on VPN services and Tor", "links": [ "<a href=\"http://turk-internet.com/portal/yazigoster.php?yaziid=54465\">Turkish article</a>", @@ -770,7 +798,9 @@ { "start": "2016-11-30", "end": "2016-12-02", - "place": "gm", + "places": [ + "gm" + ], "description": "Internet shutdown in Gambia.", "links": [ "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2016-11-1…">relay graph</a>", @@ -780,7 +810,9 @@ }, { "start": "2016-12-01", - "place": "by", + "places": [ + "by" + ], "protocols": [ "<OR>", "relay" @@ -794,7 +826,9 @@ }, { "start": "2016-12-12", - "place": "tr", + "places": [ + "tr" + ], "protocols": [ "<OR>" ], @@ -807,7 +841,9 @@ }, { "start": "2016-12-15", - "place": "cd", + "places": [ + "cd" + ], "description": "The Democratic Republic of the Congo orders a block of social media services.", "links": [ "<a href=\"http://wlrn.org/post/congo-block-social-media-sites-ahead-protests-against-…">article</a>", @@ -927,7 +963,9 @@ }, { "start": "2017-05-16", - "place": "ua", + "places": [ + "ua" + ], "description": "Ukraine blocks Russian-operated web services. Relay and bridge users increase over 5×. May be partly attributable to the <a href=\"https://freeu.online/\">FreeU Browser</a> , a browser produced and advertised by Mail.ru that includes a tor client.", "links": [ "<a href=\"https://bugs.torproject.org/22369\">ticket</a>", @@ -1102,7 +1140,9 @@ }, { "start": "2016-02-24", - "place": "tm", + "places": [ + "tm" + ], "protocols": [ "<OR>" ], @@ -1115,7 +1155,9 @@ { "start": "2016-07-21", "end": "2017-03-03", - "place": "br", + "places": [ + "br" + ], "protocols": [ "meek" ], @@ -1127,7 +1169,9 @@ }, { "start": "2016-08-18", - "place": "ml", + "places": [ + "ml" + ], "description": "Sudden increase of direct and bridge users in Mali.", "links": [ "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2016-01-0…">relay graph</a>", @@ -1137,7 +1181,9 @@ }, { "start": "2016-08-24", - "place": "cn", + "places": [ + "cn" + ], "protocols": [ "<OR>" ], @@ -1151,7 +1197,9 @@ { "start": "2016-10-09", "end": "2016-10-25", - "place": "il", + "places": [ + "il" + ], "protocols": [ "<OR>", "relay" @@ -1164,7 +1212,9 @@ }, { "start": "2016-11-20", - "place": "sa", + "places": [ + "sa" + ], "protocols": [ "<OR>" ], @@ -1177,7 +1227,9 @@ { "start": "2016-11-20", "end": "2016-12-22", - "place": "sa", + "places": [ + "sa" + ], "protocols": [ "bridge" ], @@ -1203,7 +1255,9 @@ }, { "start": "2017-01-15", - "place": "ae", + "places": [ + "ae" + ], "protocols": [ "<OR>", "relay" @@ -1219,7 +1273,9 @@ { "start": "2017-02-06", "end": "2017-08-01", - "place": "ae", + "places": [ + "ae" + ], "protocols": [ "obfs3" ], @@ -1234,7 +1290,9 @@ { "start": "2017-02-09", "end": "2017-08-01", - "place": "in", + "places": [ + "in" + ], "protocols": [ "obfs3" ], @@ -1247,7 +1305,9 @@ { "start": "2017-02-09", "end": "2017-03-21", - "place": "jo", + "places": [ + "jo" + ], "protocols": [ "obfs3" ], @@ -1260,7 +1320,9 @@ { "start": "2017-04-05", "end": "2017-04-13", - "place": "il", + "places": [ + "il" + ], "protocols": [ "<OR>", "relay" @@ -1274,7 +1336,9 @@ { "start": "2017-04-17", "end": "2017-04-23", - "place": "il", + "places": [ + "il" + ], "protocols": [ "<OR>", "relay" @@ -1287,7 +1351,9 @@ }, { "start": "2017-04-23", - "place": "tw", + "places": [ + "tw" + ], "protocols": [ "<OR>", "relay" @@ -1302,7 +1368,9 @@ { "start": "2017-05-09", "end": "2017-05-12", - "place": "mo", + "places": [ + "mo" + ], "protocols": [ "<OR>", "relay" @@ -1316,7 +1384,9 @@ }, { "start": "2017-05-10", - "place": "eg", + "places": [ + "eg" + ], "protocols": [ "<OR>", "relay" @@ -1330,7 +1400,9 @@ }, { "start": "2017-06-13", - "place": "ch", + "places": [ + "ch" + ], "protocols": [ "obfs4" ], @@ -1343,7 +1415,9 @@ }, { "start": "2017-06-14", - "place": "ml", + "places": [ + "ml" + ], "description": "Sudden increase of direct and bridge users in Mali.", "links": [ "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-01-0…">relay graph</a>", @@ -1354,7 +1428,9 @@ { "start": "2017-07-15", "end": "2017-07-22", - "place": "sc", + "places": [ + "sc" + ], "protocols": [ "<OR>", "relay" @@ -1367,7 +1443,9 @@ }, { "start": "2017-07-31", - "place": "nl", + "places": [ + "nl" + ], "protocols": [ "<OR>", "relay" @@ -1380,7 +1458,9 @@ }, { "start": "2017-07-31", - "place": "ro", + "places": [ + "ro" + ], "protocols": [ "<OR>", "relay" @@ -1393,7 +1473,9 @@ }, { "start": "2017-08-02", - "place": "lt", + "places": [ + "lt" + ], "protocols": [ "<OR>", "relay" @@ -1406,7 +1488,9 @@ }, { "start": "2017-08-06", - "place": "sc", + "places": [ + "sc" + ], "protocols": [ "<OR>", "relay" @@ -1419,7 +1503,9 @@ }, { "start": "2017-08-07", - "place": "at", + "places": [ + "at" + ], "protocols": [ "<OR>", "relay" @@ -1432,7 +1518,9 @@ }, { "start": "2017-08-15", - "place": "hk", + "places": [ + "hk" + ], "protocols": [ "<OR>", "relay" @@ -1444,28 +1532,19 @@ "unknown": true }, { - "start": "2017-08-22", - "place": "eg", - "protocols": [ - "<OR>", - "relay" - ], - "description": "More than 8x sudden increase in direct Tor users in Egypt. Bridge users not affected.", - "links": [ - "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-06-0…">relay graph</a>" + "start": "2017-08-27", + "end": "2017-08-29", + "places": [ + "eg", + "tr" ], - "unknown": true - }, - { - "start": "2017-08-22", - "place": "tr", "protocols": [ "<OR>", "relay" ], - "description": "Massive sudden increase of relay users in Turkey. Bridge users not affected.", + "description": "Short-lived, simultaneous spike in direct users in Egypt and Turkey. Bridge users not affected.", "links": [ - "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-06-0…">relay graph</a>" + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-07-0…">relay graph</a>" ], "unknown": true }

1 0

[tor-messenger-build/esr52] Compile Linux builds with Selfrando
by sukhbir＠torproject.org 06 Sep '17

06 Sep '17

commit f63b980484f55bdf0bab86720587077b4474b679 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Sep 3 12:41:38 2017 -0400 Compile Linux builds with Selfrando Changes borrowed from tor-browser-build.git --- keyring/elfutils.gpg | 1 + keyring/selfrando.gpg | 1 + projects/elfutils | 1 + projects/instantbird/build | 8 ++++++++ projects/instantbird/config | 3 +++ projects/selfrando | 1 + tor-browser-build | 2 +- 7 files changed, 16 insertions(+), 1 deletion(-) diff --git a/keyring/elfutils.gpg b/keyring/elfutils.gpg new file mode 120000 index 0000000..6e82beb --- /dev/null +++ b/keyring/elfutils.gpg @@ -0,0 +1 @@ +../tor-browser-build/keyring/elfutils.gpg \ No newline at end of file diff --git a/keyring/selfrando.gpg b/keyring/selfrando.gpg new file mode 120000 index 0000000..fee6b9c --- /dev/null +++ b/keyring/selfrando.gpg @@ -0,0 +1 @@ +../tor-browser-build/keyring/selfrando.gpg \ No newline at end of file diff --git a/projects/elfutils b/projects/elfutils new file mode 120000 index 0000000..b4beda5 --- /dev/null +++ b/projects/elfutils @@ -0,0 +1 @@ +../tor-browser-build/projects/elfutils \ No newline at end of file diff --git a/projects/instantbird/build b/projects/instantbird/build index 7813fe2..d9cbdb0 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -28,6 +28,14 @@ mkdir -p /var/tmp/build export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] +[% IF c("var/linux") -%] + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] + # Selfrando wrapper + export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" + # We need to avoid the shuffling while building as this breaks compilation + export SELFRANDO_skip_shuffle= +[% END -%] + tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% IF c("var/osx") %] diff --git a/projects/instantbird/config b/projects/instantbird/config index ed09aa0..1d89837 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -83,6 +83,9 @@ input_files: - name: binutils project: binutils enable: '[% c("var/linux") %]' + - project: selfrando + name: selfrando + enable: '[% c("var/linux") %]' - project: gcc name: gcc enable: '[% c("var/windows") %]' diff --git a/projects/selfrando b/projects/selfrando new file mode 120000 index 0000000..c7e52e1 --- /dev/null +++ b/projects/selfrando @@ -0,0 +1 @@ +../tor-browser-build/projects/selfrando/ \ No newline at end of file diff --git a/tor-browser-build b/tor-browser-build index 86210c6..da7485a 160000 --- a/tor-browser-build +++ b/tor-browser-build @@ -1 +1 @@ -Subproject commit 86210c6821e393e98dd58c7d7bb6223755b496d5 +Subproject commit da7485a0b8f89b9ee2278d6132fc7bb53d5220e8

1 0

[tor-messenger-build/esr52] Bump to tor-browser@7.0.5
by sukhbir＠torproject.org 06 Sep '17

06 Sep '17

commit c382d7d037a35bd246c783d2886ef8c4ce200cd2 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Sep 6 10:18:41 2017 -0400 Bump to tor-browser(a)7.0.5 --- ChangeLog | 2 +- projects/tor-browser/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d74ab16..dd51baa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ Tor Messenger 0.5.0b1 -- * All Platforms * Use the tor-browser-52.3.0esr-7.0-1-build1 tag on tor-browser * Use the THUNDERBIRD_52_3_0_RELEASE tag on comm-esr52 - * Update tor-browser to 7.0.4 + * Update tor-browser to 7.0.5 * Update tor-launcher to 0.2.12.3 * Trac 22005: Move to ESR 52 * Trac 16606: Temporary XMPP accounts diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 395c07f..0a5c8ad 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 7.0.4 +version: 7.0.5 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files:

1 0