April 2018 - tor-commits - lists.torproject.org

[user-manual/master] Pushing fixed English images
by colin＠torproject.org 16 Apr '18

16 Apr '18

commit e9bf254d75b6e6f28316d67ece370f77b129159e Author: Colin Childs <colin(a)torproject.org> Date: Wed Apr 11 18:36:30 2018 -0500 Pushing fixed English images --- C/media/circumvention/bridges.png | Bin 171483 -> 221675 bytes C/media/circumvention/configure.png | Bin 101114 -> 221675 bytes C/media/circumvention/start_window.png | Bin 98256 -> 213438 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/C/media/circumvention/bridges.png b/C/media/circumvention/bridges.png index 1a0c335..7cebfab 100644 Binary files a/C/media/circumvention/bridges.png and b/C/media/circumvention/bridges.png differ diff --git a/C/media/circumvention/configure.png b/C/media/circumvention/configure.png index 6aaf571..7cebfab 100644 Binary files a/C/media/circumvention/configure.png and b/C/media/circumvention/configure.png differ diff --git a/C/media/circumvention/start_window.png b/C/media/circumvention/start_window.png index 0eb7554..411776d 100644 Binary files a/C/media/circumvention/start_window.png and b/C/media/circumvention/start_window.png differ

1 0

[tor/master] token: Fix uint32_t to uint64_t conversion
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit ae4e5b98245169dc02c12138d4acc69ce7da0261 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Apr 16 15:02:51 2018 -0400 token: Fix uint32_t to uint64_t conversion Unfortunately, the units passed to monotime_coarse_stamp_units_to_approx_msec() was always 0 due to a type conversion. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/common/token_bucket.c | 5 +++-- src/common/token_bucket.h | 3 +++ src/test/test_bwmgt.c | 23 +++++++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/common/token_bucket.c b/src/common/token_bucket.c index 5d97a920f..d18731b0e 100644 --- a/src/common/token_bucket.c +++ b/src/common/token_bucket.c @@ -108,7 +108,7 @@ token_bucket_raw_dec(token_bucket_raw_t *bucket, } /** Convert a rate in bytes per second to a rate in bytes per step */ -static uint32_t +STATIC uint32_t rate_per_sec_to_rate_per_step(uint32_t rate) { /* @@ -117,8 +117,9 @@ rate_per_sec_to_rate_per_step(uint32_t rate) (rate / 1000) * to_approximate_msec(TICKS_PER_STEP). But to minimize rounding error, we do it this way instead, and divide last. */ + uint64_t units = (uint64_t) rate * TICKS_PER_STEP; uint32_t val = (uint32_t) - monotime_coarse_stamp_units_to_approx_msec(rate*TICKS_PER_STEP)/1000; + monotime_coarse_stamp_units_to_approx_msec(units) / 1000; return val ? val : 1; } diff --git a/src/common/token_bucket.h b/src/common/token_bucket.h index 329b652f8..fb5d9fc60 100644 --- a/src/common/token_bucket.h +++ b/src/common/token_bucket.h @@ -10,6 +10,7 @@ #define TOR_TOKEN_BUCKET_H #include "torint.h" +#include "testsupport.h" /** Largest allowable burst value for a token buffer. */ #define TOKEN_BUCKET_MAX_BURST INT32_MAX @@ -109,6 +110,8 @@ token_bucket_rw_get_write(const token_bucket_rw_t *bucket) * a power of two if you can. */ #define TICKS_PER_STEP 16 +STATIC uint32_t rate_per_sec_to_rate_per_step(uint32_t rate); + #endif #endif /* TOR_TOKEN_BUCKET_H */ diff --git a/src/test/test_bwmgt.c b/src/test/test_bwmgt.c index 0579b4a41..268917005 100644 --- a/src/test/test_bwmgt.c +++ b/src/test/test_bwmgt.c @@ -16,6 +16,7 @@ // an imaginary time, in timestamp units. Chosen so it will roll over. static const uint32_t START_TS = UINT32_MAX-10; static const int32_t KB = 1024; +static const uint32_t GB = (U64_LITERAL(1) << 30); static void test_bwmgt_token_buf_init(void *arg) @@ -192,6 +193,27 @@ test_bwmgt_token_buf_refill(void *arg) ; } +/* Test some helper functions we use within the token bucket interface. */ +static void +test_bwmgt_token_buf_helpers(void *arg) +{ + uint32_t ret; + + (void) arg; + + /* The returned value will be OS specific but in any case, it should be + * greater than 1 since we are passing 1GB/sec rate. */ + ret = rate_per_sec_to_rate_per_step(1 * GB); + tt_u64_op(ret, OP_GT, 1); + + /* We default to 1 in case rate is 0. */ + ret = rate_per_sec_to_rate_per_step(0); + tt_u64_op(ret, OP_EQ, 1); + + done: + ; +} + #define BWMGT(name) \ { #name, test_bwmgt_ ## name , 0, NULL, NULL } @@ -200,6 +222,7 @@ struct testcase_t bwmgt_tests[] = { BWMGT(token_buf_adjust), BWMGT(token_buf_dec), BWMGT(token_buf_refill), + BWMGT(token_buf_helpers), END_OF_TESTCASES };

1 0

[doctor/master] Simple script to check if your relay's up
by atagar＠torproject.org 16 Apr '18

16 Apr '18

commit 1b7516ba890f02c989e837ec11458c00e2a7f488 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 16 11:52:09 2018 -0700 Simple script to check if your relay's up Great first use of our new ORPort capabilities. Using it to provide a health check when my relay's down. If this goes well I'l add it to our Stem tutorials. Yeah, yeah, I know. Not dirauth related. But hey, there's no reason DocTor can't provide outage notifications to me as well! :P --- relay_check.py | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/relay_check.py b/relay_check.py new file mode 100755 index 0000000..2a40179 --- /dev/null +++ b/relay_check.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python +# Copyright 2018, Damian Johnson and The Tor Project +# See LICENSE for licensing information + +""" +Health checks for your relay. This provides a simple email notification when +your relay has become unavailable. +""" + +import smtplib +import traceback + +import stem +import stem.client + +from email.mime.multipart import MIMEMultipart +from email.mime.text import MIMEText + +RELAY_ADDRESS = '208.113.135.162' +RELAY_OR_PORT = 1443 +RELAY_NAME = 'caersidi' +RELAY_FINGERPRINT = '3BB34C63072D9D10E836EE42968713F7B9325F66' + +EMAIL_ADDRESS = 'atagar(a)torproject.org' +RELAY_LINK = 'https://metrics.torproject.org/rs.html#details/%s' % RELAY_FINGERPRINT + + +def main(): + try: + with stem.client.Relay.connect(RELAY_ADDRESS, RELAY_OR_PORT, [3]) as relay: + circ = relay.create_circuit() + circ.send('RELAY_BEGIN_DIR', stream_id = 1) + our_descriptor = circ.send('RELAY_DATA', 'GET /tor/server/authority HTTP/1.0\r\n\r\n', stream_id = 1).data + circ.close() + + if 'router %s %s %s' % (RELAY_NAME, RELAY_ADDRESS, RELAY_OR_PORT) not in our_descriptor: + email('Unable to fetch %s descriptor' % RELAY_NAME, "Unable to retrieve the descriptor of %s (%s):\n\n%s" % (RELAY_NAME, RELAY_LINK, our_descriptor)) + except stem.SocketError: + email('Unable to reach %s' % RELAY_NAME, "Unable to reach %s (%s):\n\n%s" % (RELAY_NAME, RELAY_LINK, traceback.format_exc())) + + +def email(subject, body): + """ + Sends an email notification via the local mail application. + + :param str subject: email subject + :param str body: email content + + :raises: **Exception** if the email fails to be sent + """ + + msg = MIMEMultipart('alternative') + msg['Subject'] = subject + msg['To'] = EMAIL_ADDRESS + + msg.attach(MIMEText(body, 'plain')) + + server = smtplib.SMTP('localhost') + server.sendmail(FROM_ADDRESS, destinations, msg.as_string()) + server.quit() + + +if __name__ == '__main__': + try: + main() + except: + email('Health check error', "Unable to check the health of %s (%s):\n\n%s" % (RELAY_NAME, RELAY_LINK, traceback.format_exc()))

1 0

[tor-browser-build/master] Release preparations for 8.0a6
by gk＠torproject.org 16 Apr '18

16 Apr '18

commit 12a0d42d620256023640578b8bb7a23520710056 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 16 18:41:32 2018 +0000 Release preparations for 8.0a6 Changelog update, versions bump --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/openssl/config | 4 ++-- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 23 ++++++++++++++++++++++ projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 7 +++---- 7 files changed, 32 insertions(+), 10 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 8412c2c..ee79a15 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 38eb2be..cfa0a78 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.3.13 +version: 2018.4.11 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/openssl/config b/projects/openssl/config index 378ee53..9ab54c6 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.0.2n +version: 1.0.2o filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -25,4 +25,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 370babb75f278c39e0c50e8c4e7493bc0f18db6867478341a832a982fd15a8fe + sha256sum: ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index aeb0cac..b9d3941 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,26 @@ +Tor Browser 8.0a6 -- April 19 2018 + * All platforms + * Update Tor to 0.3.3.5-rc + * Update OpenSSL to 1.0.2o + * Update Torbutton to 1.9.9.1 + * Bug 25126: Make about:tor layout responsive + * Translations update + * Update HTTPS Everywhere to 2018.4.11 + * Update NoScript to 5.1.8.5 + * Bug 21537: Mark .onion cookies as secure + * Bug 21850: Update about:tbupdate handling for e10s + * Bug 25721: Backport patches from Mozilla's bug 1448771 + * Linux + * Bug 20283: Tor Browser should run without a `/proc` filesystem. + * Windows + * Bug 13893: Make EMET compatible with Tor Browser + * Build System + * Windows + * Bug 25420: Update GCC to 6.4.0 + * Bug 20302: Fix FTE compilation for Windows with GCC 6.4.0 + * Linux + * Bug 25304: Update GCC to 6.4.0 + Tor Browser 8.0a5 -- March 27 2018 * All platforms * Update Firefox to 52.7.3esr diff --git a/projects/tor/config b/projects/tor/config index 7029880..78d834f 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.3.3-alpha +version: 0.3.3.5-rc git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/projects/torbutton/config b/projects/torbutton/config index de7691a..93bef30 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.9.9 +version: 1.9.9.1 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 2654371..87ab109 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,11 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0a5' - torbrowser_build: 'build2' + torbrowser_version: '8.0a6' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0a3 - - 8.0a4 + - 8.0a5 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor/maint-0.3.2] Fix an LCOV exclusion pattern in address.c
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 0e13ff48155ca8cda7483afe730652bed61ba5a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 13:48:21 2018 -0400 Fix an LCOV exclusion pattern in address.c --- src/common/address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 68ad63941..96b99fa08 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1199,7 +1199,7 @@ tor_addr_hash(const tor_addr_t *addr) /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; - /* LCOV_EXCL_END */ + /* LCOV_EXCL_STOP */ } } @@ -1221,7 +1221,7 @@ tor_addr_keyed_hash(const struct sipkey *key, const tor_addr_t *addr) /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; - /* LCOV_EXCL_END */ + /* LCOV_EXCL_STOP */ } }

1 0

[tor/maint-0.2.9] Fix an LCOV exclusion pattern in address.c
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 0e13ff48155ca8cda7483afe730652bed61ba5a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 13:48:21 2018 -0400 Fix an LCOV exclusion pattern in address.c --- src/common/address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 68ad63941..96b99fa08 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1199,7 +1199,7 @@ tor_addr_hash(const tor_addr_t *addr) /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; - /* LCOV_EXCL_END */ + /* LCOV_EXCL_STOP */ } } @@ -1221,7 +1221,7 @@ tor_addr_keyed_hash(const struct sipkey *key, const tor_addr_t *addr) /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; - /* LCOV_EXCL_END */ + /* LCOV_EXCL_STOP */ } }

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 5e0fbd7006993a4e402f2eee49f6f86074923197 Merge: db6902c23 0e13ff481 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 13:48:23 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/common/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 5e0fbd7006993a4e402f2eee49f6f86074923197 Merge: db6902c23 0e13ff481 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 13:48:23 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/common/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Fix an LCOV exclusion pattern in address.c
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 0e13ff48155ca8cda7483afe730652bed61ba5a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 13:48:21 2018 -0400 Fix an LCOV exclusion pattern in address.c --- src/common/address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 68ad63941..96b99fa08 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1199,7 +1199,7 @@ tor_addr_hash(const tor_addr_t *addr) /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; - /* LCOV_EXCL_END */ + /* LCOV_EXCL_STOP */ } } @@ -1221,7 +1221,7 @@ tor_addr_keyed_hash(const struct sipkey *key, const tor_addr_t *addr) /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; - /* LCOV_EXCL_END */ + /* LCOV_EXCL_STOP */ } }

1 0

[tor/master] Fix an LCOV exclusion pattern in address.c
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 0e13ff48155ca8cda7483afe730652bed61ba5a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 13:48:21 2018 -0400 Fix an LCOV exclusion pattern in address.c --- src/common/address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 68ad63941..96b99fa08 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1199,7 +1199,7 @@ tor_addr_hash(const tor_addr_t *addr) /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; - /* LCOV_EXCL_END */ + /* LCOV_EXCL_STOP */ } } @@ -1221,7 +1221,7 @@ tor_addr_keyed_hash(const struct sipkey *key, const tor_addr_t *addr) /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; - /* LCOV_EXCL_END */ + /* LCOV_EXCL_STOP */ } }

1 0