March 2019 - tor-commits - lists.torproject.org

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit a9c84bfd358799dc2dbe805ff6db4a6ca184ef0b Merge: c40d53ab3 f186f21a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 09:45:31 2019 -0400 Merge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0 src/lib/time/compat_time.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.0'
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit 733afb52a8267d4b74e9437c71a0d8c65a9b954a Merge: 911f95ed9 a9c84bfd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 09:45:48 2019 -0400 Merge branch 'maint-0.4.0' src/lib/time/compat_time.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit a9c84bfd358799dc2dbe805ff6db4a6ca184ef0b Merge: c40d53ab3 f186f21a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 09:45:31 2019 -0400 Merge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0 src/lib/time/compat_time.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] doc: Fix an incorrect comment about calling FreeLibrary() on Windows
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit f186f21a4efb9dafe2c29f850126d509079c0c37 Author: teor <teor(a)torproject.org> Date: Mon Mar 4 11:22:02 2019 +1000 doc: Fix an incorrect comment about calling FreeLibrary() on Windows There's an incorrect comment in compat_time.c that suggests we call FreeLibrary() before we're done using the library's functions. See 29642 for background. Closes ticket 29643. --- src/lib/time/compat_time.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/time/compat_time.c b/src/lib/time/compat_time.c index 33e077a58..c6625c780 100644 --- a/src/lib/time/compat_time.c +++ b/src/lib/time/compat_time.c @@ -522,7 +522,9 @@ monotime_init_internal(void) GetTickCount64_fn = (GetTickCount64_fn_t) GetProcAddress(h, "GetTickCount64"); } - // FreeLibrary(h) ? + // We can't call FreeLibrary(h) here, because freeing the handle may + // unload the library, and cause future calls to GetTickCount64_fn() + // to fail. See 29642 for details. } void

1 0

[tor/release-0.4.0] doc: Fix an incorrect comment about calling FreeLibrary() on Windows
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit f186f21a4efb9dafe2c29f850126d509079c0c37 Author: teor <teor(a)torproject.org> Date: Mon Mar 4 11:22:02 2019 +1000 doc: Fix an incorrect comment about calling FreeLibrary() on Windows There's an incorrect comment in compat_time.c that suggests we call FreeLibrary() before we're done using the library's functions. See 29642 for background. Closes ticket 29643. --- src/lib/time/compat_time.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/time/compat_time.c b/src/lib/time/compat_time.c index 33e077a58..c6625c780 100644 --- a/src/lib/time/compat_time.c +++ b/src/lib/time/compat_time.c @@ -522,7 +522,9 @@ monotime_init_internal(void) GetTickCount64_fn = (GetTickCount64_fn_t) GetProcAddress(h, "GetTickCount64"); } - // FreeLibrary(h) ? + // We can't call FreeLibrary(h) here, because freeing the handle may + // unload the library, and cause future calls to GetTickCount64_fn() + // to fail. See 29642 for details. } void

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit a9c84bfd358799dc2dbe805ff6db4a6ca184ef0b Merge: c40d53ab3 f186f21a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 09:45:31 2019 -0400 Merge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0 src/lib/time/compat_time.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit d1a1be822eb97f7518338da0eef82965b31f0916 Merge: 31a9caa27 a9c84bfd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 09:45:48 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 src/lib/time/compat_time.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[torspec/master] fixup! bandwidth-file: Add scanner and destination country
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit 5a5571e7d2981c4be290361416d3c692ac7b7bae Author: juga0 <juga(a)riseup.net> Date: Wed Mar 6 06:35:14 2019 +0000 fixup! bandwidth-file: Add scanner and destination country --- bandwidth-file-spec.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt index ba6cff2..9ec7bbb 100644 --- a/bandwidth-file-spec.txt +++ b/bandwidth-file-spec.txt @@ -104,7 +104,8 @@ padding characters omitted. DateTime ::= "YYYY-MM-DDTHH:MM:SS", as in ISO 8601 CountryCode ::= Two capital ASCII letters ([A-Z]{2}), as defined in - ISO 3166-1 alpha-2 plus "ZZ" to denote unknown country. + ISO 3166-1 alpha-2 plus "ZZ" to denote unknown country + (eg the destination is in a Content Delivery Network). CountryCodeList ::= One or more CountryCode(s) separated by a comma ([A-Z]{2}(,[A-Z]{2})*). @@ -299,9 +300,6 @@ The destination Web Servers serve the data that the generator retrieves to measure the bandwidth. - The code "ZZ" is used here to denote that the country is unknown. - For instance, when the destination is in a Content Delivery Network. - This Line was added in version 1.3.0 of this specification. KeyValue NL

1 0

[torspec/master] bandwidth-file: Add scanner and destination country
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit 63779daf02340c35b8e4d6018f331579419e0691 Author: juga0 <juga(a)riseup.net> Date: Fri Mar 1 10:37:03 2019 +0000 bandwidth-file: Add scanner and destination country Closes: #29354 --- bandwidth-file-spec.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt index a241108..ba6cff2 100644 --- a/bandwidth-file-spec.txt +++ b/bandwidth-file-spec.txt @@ -103,6 +103,10 @@ MasterKey ::= a base64-encoded Ed25519 public key, with padding characters omitted. DateTime ::= "YYYY-MM-DDTHH:MM:SS", as in ISO 8601 + CountryCode ::= Two capital ASCII letters ([A-Z]{2}), as defined in + ISO 3166-1 alpha-2 plus "ZZ" to denote unknown country. + CountryCodeList ::= One or more CountryCode(s) separated by a comma + ([A-Z]{2}(,[A-Z]{2})*). Note that key_value and value are defined in Tor directory protocol with different formats to KeyValue and Value here. @@ -278,6 +282,28 @@ This Line was added in version 1.2.0 of this specification. + "scanner_country=" CountryCode NL + + [Zero or one time.] + + The country, as in political geolocation, where the generator is run. + + This Line was added in version 1.3.0 of this specification. + + "destinations_countries=" CountryCodeList NL + + [Zero or one time.] + + The country, as in political geolocation, or countries where the + destination Web server(s) are located. + The destination Web Servers serve the data that the generator retrieves + to measure the bandwidth. + + The code "ZZ" is used here to denote that the country is unknown. + For instance, when the destination is in a Content Delivery Network. + + This Line was added in version 1.3.0 of this specification. + KeyValue NL [Zero or more times.] @@ -618,6 +644,24 @@ software=sbws software_version=1.0.3 ===== +A.4. Headers generated by sbws version 1.0.4 + +1523911758 +version=1.3.0 +latest_bandwidth=2018-04-16T20:49:18 +destinations_countries=TH,ZZ +file_created=2018-04-16T21:49:18 +generator_started=2018-04-16T15:13:25 +earliest_bandwidth=2018-04-16T15:13:26 +minimum_number_eligible_relays=3862 +minimum_percent_eligible_relays=60 +number_consensus_relays=6436 +number_eligible_relays=6000 +percent_eligible_relays=93 +scanner_country=SN +software=sbws +software_version=1.0.4 + B. Scaling bandwidths B.1. Scaling requirements

1 0

[torspec/master] Merge remote-tracking branch 'tor-github/pr/59'
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit 7139f7a7d1d39183c349cef1e000549a2bfc172e Merge: e6ce394 5a5571e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 09:44:00 2019 -0400 Merge remote-tracking branch 'tor-github/pr/59' bandwidth-file-spec.txt | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+)

1 0