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

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

11 Sep '17

commit 5f4aaf484ec503c8301f5ede0ad7c8412fd1a499 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 11 22:04:32 2017 +0200 Update news.json to version 128 of doc/MetricsTimeline. --- website/src/main/resources/etc/news.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index b4ecd1d..bfa3819 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -1167,9 +1167,10 @@ "protocols": [ "obfs4" ], - "description": "A flood of new obfs4 bridges nicknamed \"Machiavelli\".", + "description": "A flood of over 4,000 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://lists.torproject.org/pipermail/tor-relays/2017-September/012925.htm…">tor-relays post</a>", "<a href=\"https://twitter.com/nusenu_/status/905580044503969792\">tweet</a>" ] },

1 0

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

11 Sep '17

commit 9fb150252f0b655fe8429208cc5e07d5940adaac Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 11 19:45:32 2017 +0000 Update translations for https_everywhere --- nl/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index a06fd62b4..2204d4bb3 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -25,7 +25,7 @@ <!ENTITY https-everywhere.menu.viewAllRules "Toon Alle Regels"> <!ENTITY https-everywhere.options.importSettings "Import Settings"> -<!ENTITY https-everywhere.options.import "Import"> +<!ENTITY https-everywhere.options.import "Importeren"> <!ENTITY https-everywhere.options.imported "Your settings have been imported."> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere-voorkeuren">

1 0

[tor/master] test: Fix memleaks
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit 59072d20277fe6250d0e9b6cf90bf41a75ad651c Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Sep 11 14:39:24 2017 -0400 test: Fix memleaks Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_hs_common.c | 15 +++++++++------ src/test/test_nodelist.c | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index b0e7f5e1e..da592eb08 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -1494,9 +1494,6 @@ helper_test_hsdir_sync(networkstatus_t *ns, * the client was also picked by service. */ - cleanup_nodelist(); - smartlist_clear(ns->routerstatus_list); - /* 1) Initialize service time: consensus and real time */ time_t now = helper_set_consensus_and_system_time(ns, service_between_srv_and_tp); @@ -1508,6 +1505,8 @@ helper_test_hsdir_sync(networkstatus_t *ns, /* Now let's upload our desc to all hsdirs */ upload_descriptor_to_all(service, desc); + /* 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); @@ -1515,6 +1514,8 @@ helper_test_hsdir_sync(networkstatus_t *ns, now = helper_set_consensus_and_system_time(ns, client_between_srv_and_tp); cleanup_nodelist(); + SMARTLIST_FOREACH(ns->routerstatus_list, + routerstatus_t *, rs, routerstatus_free(rs)); smartlist_clear(ns->routerstatus_list); helper_initialize_big_hash_ring(ns); @@ -1522,6 +1523,8 @@ helper_test_hsdir_sync(networkstatus_t *ns, char client_hsdir_b64_digest[BASE64_DIGEST_LEN+1] = {0}; helper_client_pick_hsdir(&service->keys.identity_pk, client_hsdir_b64_digest); + /* Cleanup right now so we don't memleak on error. */ + cleanup_nodelist(); /* CHECK: Go through the hsdirs chosen by the service and make sure that it * contains the one picked by the client! */ @@ -1534,6 +1537,9 @@ helper_test_hsdir_sync(networkstatus_t *ns, * need it for next scenario. */ hs_service_free_all(); hs_service_init(); + SMARTLIST_FOREACH(ns->routerstatus_list, + routerstatus_t *, rs, routerstatus_free(rs)); + smartlist_clear(ns->routerstatus_list); } /** This test ensures that client and service will pick the same HSDirs, under @@ -1643,9 +1649,6 @@ test_client_service_hsdir_set_sync(void *arg) helper_test_hsdir_sync(ns, 0, 1, 0); done: - SMARTLIST_FOREACH(ns->routerstatus_list, - routerstatus_t *, rs, routerstatus_free(rs)); - smartlist_clear(ns->routerstatus_list); networkstatus_vote_free(ns); nodelist_free_all(); hs_free_all(); diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c index db2a8fd02..a873003d7 100644 --- a/src/test/test_nodelist.c +++ b/src/test/test_nodelist.c @@ -197,8 +197,8 @@ test_nodelist_ed_id(void *arg) tor_free(ri[i]->cache_info.signing_key_cert); tor_free(ri[i]); } - smartlist_free(ns->routerstatus_list); - tor_free(ns); + smartlist_clear(ns->routerstatus_list); + networkstatus_vote_free(ns); UNMOCK(networkstatus_get_latest_consensus); UNMOCK(networkstatus_get_latest_consensus_by_flavor); }

1 0

[tor/maint-0.3.1] Extract the important parts of the run-pending-timers function.
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit 72ea4a8f081318c60c460cef5d9daf55e399c434 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 13:48:39 2017 -0400 Extract the important parts of the run-pending-timers function. Our unit tests will need this, so that they can simulate advancing time without getting libevent involved. --- src/common/timers.c | 26 ++++++++++++++++++-------- src/common/timers.h | 4 ++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/common/timers.c b/src/common/timers.c index 6f4a6c30f..c43c49c08 100644 --- a/src/common/timers.c +++ b/src/common/timers.c @@ -29,6 +29,8 @@ #include "orconfig.h" +#define TOR_TIMERS_PRIVATE + #include "compat.h" #include "compat_libevent.h" #include "timers.h" @@ -148,6 +150,21 @@ libevent_timer_reschedule(void) event_add(global_timer_event, &d); } +/** Run the callback of every timer that has expired, based on the current + * output of monotime_get(). */ +STATIC void +timers_run_pending(void) +{ + monotime_t now; + monotime_get(&now); + timer_advance_to_cur_time(&now); + + tor_timer_t *t; + while ((t = timeouts_get(global_timeouts))) { + t->callback.cb(t, t->callback.arg, &now); + } +} + /** * Invoked when the libevent timer has expired: see which tor_timer_t events * have fired, activate their callbacks, and reschedule the libevent timer. @@ -159,14 +176,7 @@ libevent_timer_callback(evutil_socket_t fd, short what, void *arg) (void)what; (void)arg; - monotime_t now; - monotime_get(&now); - timer_advance_to_cur_time(&now); - - tor_timer_t *t; - while ((t = timeouts_get(global_timeouts))) { - t->callback.cb(t, t->callback.arg, &now); - } + timers_run_pending(); libevent_timer_reschedule(); } diff --git a/src/common/timers.h b/src/common/timers.h index e816630e6..d9602cd2a 100644 --- a/src/common/timers.h +++ b/src/common/timers.h @@ -22,5 +22,9 @@ void timer_free(tor_timer_t *t); void timers_initialize(void); void timers_shutdown(void); +#ifdef TOR_TIMERS_PRIVATE +STATIC void timers_run_pending(void); +#endif + #endif

1 0

[tor/master] Extract the important parts of the run-pending-timers function.
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit 72ea4a8f081318c60c460cef5d9daf55e399c434 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 13:48:39 2017 -0400 Extract the important parts of the run-pending-timers function. Our unit tests will need this, so that they can simulate advancing time without getting libevent involved. --- src/common/timers.c | 26 ++++++++++++++++++-------- src/common/timers.h | 4 ++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/common/timers.c b/src/common/timers.c index 6f4a6c30f..c43c49c08 100644 --- a/src/common/timers.c +++ b/src/common/timers.c @@ -29,6 +29,8 @@ #include "orconfig.h" +#define TOR_TIMERS_PRIVATE + #include "compat.h" #include "compat_libevent.h" #include "timers.h" @@ -148,6 +150,21 @@ libevent_timer_reschedule(void) event_add(global_timer_event, &d); } +/** Run the callback of every timer that has expired, based on the current + * output of monotime_get(). */ +STATIC void +timers_run_pending(void) +{ + monotime_t now; + monotime_get(&now); + timer_advance_to_cur_time(&now); + + tor_timer_t *t; + while ((t = timeouts_get(global_timeouts))) { + t->callback.cb(t, t->callback.arg, &now); + } +} + /** * Invoked when the libevent timer has expired: see which tor_timer_t events * have fired, activate their callbacks, and reschedule the libevent timer. @@ -159,14 +176,7 @@ libevent_timer_callback(evutil_socket_t fd, short what, void *arg) (void)what; (void)arg; - monotime_t now; - monotime_get(&now); - timer_advance_to_cur_time(&now); - - tor_timer_t *t; - while ((t = timeouts_get(global_timeouts))) { - t->callback.cb(t, t->callback.arg, &now); - } + timers_run_pending(); libevent_timer_reschedule(); } diff --git a/src/common/timers.h b/src/common/timers.h index e816630e6..d9602cd2a 100644 --- a/src/common/timers.h +++ b/src/common/timers.h @@ -22,5 +22,9 @@ void timer_free(tor_timer_t *t); void timers_initialize(void); void timers_shutdown(void); +#ifdef TOR_TIMERS_PRIVATE +STATIC void timers_run_pending(void); +#endif + #endif

1 0

[tor/release-0.3.1] Extract the important parts of the run-pending-timers function.
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit 72ea4a8f081318c60c460cef5d9daf55e399c434 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 13:48:39 2017 -0400 Extract the important parts of the run-pending-timers function. Our unit tests will need this, so that they can simulate advancing time without getting libevent involved. --- src/common/timers.c | 26 ++++++++++++++++++-------- src/common/timers.h | 4 ++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/common/timers.c b/src/common/timers.c index 6f4a6c30f..c43c49c08 100644 --- a/src/common/timers.c +++ b/src/common/timers.c @@ -29,6 +29,8 @@ #include "orconfig.h" +#define TOR_TIMERS_PRIVATE + #include "compat.h" #include "compat_libevent.h" #include "timers.h" @@ -148,6 +150,21 @@ libevent_timer_reschedule(void) event_add(global_timer_event, &d); } +/** Run the callback of every timer that has expired, based on the current + * output of monotime_get(). */ +STATIC void +timers_run_pending(void) +{ + monotime_t now; + monotime_get(&now); + timer_advance_to_cur_time(&now); + + tor_timer_t *t; + while ((t = timeouts_get(global_timeouts))) { + t->callback.cb(t, t->callback.arg, &now); + } +} + /** * Invoked when the libevent timer has expired: see which tor_timer_t events * have fired, activate their callbacks, and reschedule the libevent timer. @@ -159,14 +176,7 @@ libevent_timer_callback(evutil_socket_t fd, short what, void *arg) (void)what; (void)arg; - monotime_t now; - monotime_get(&now); - timer_advance_to_cur_time(&now); - - tor_timer_t *t; - while ((t = timeouts_get(global_timeouts))) { - t->callback.cb(t, t->callback.arg, &now); - } + timers_run_pending(); libevent_timer_reschedule(); } diff --git a/src/common/timers.h b/src/common/timers.h index e816630e6..d9602cd2a 100644 --- a/src/common/timers.h +++ b/src/common/timers.h @@ -22,5 +22,9 @@ void timer_free(tor_timer_t *t); void timers_initialize(void); void timers_shutdown(void); +#ifdef TOR_TIMERS_PRIVATE +STATIC void timers_run_pending(void); +#endif + #endif

1 0

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

11 Sep '17

commit 4d4e2fc22489fcbc2427a3275f6b95cfe4e9ccdd Merge: 6108499c9 72ea4a8f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 13:49:12 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/common/timers.c | 26 ++++++++++++++++++-------- src/common/timers.h | 4 ++++ 2 files changed, 22 insertions(+), 8 deletions(-)

1 0

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

11 Sep '17

commit 52c40330c8ab0c43c5773349d033ff7e49f02f53 Merge: 67a5d4cb6 72ea4a8f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 13:49:20 2017 -0400 Merge branch 'maint-0.3.1' src/common/timers.c | 26 ++++++++++++++++++-------- src/common/timers.h | 4 ++++ 2 files changed, 22 insertions(+), 8 deletions(-)

1 0

[stem/master] Fix inversion of HAS_ENCODING_ARG
by atagar＠torproject.org 11 Sep '17

11 Sep '17

commit 6c0d26e93949dce170a97d37d72b064d6e9790cd Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 11 09:57:33 2017 -0700 Fix inversion of HAS_ENCODING_ARG Oops, fixing HAS_ENCODING_ARG caused another regression where 'two wrongs were making a right'. Caught thanks to our jenkins tests. --- stem/manual.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/manual.py b/stem/manual.py index 2dd55747..df074c1b 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -486,7 +486,7 @@ class Manual(object): :raises: **IOError** if unable to retrieve the manual """ - man_cmd = 'man %s -P cat %s' % ('' if HAS_ENCODING_ARG else '--encoding=ascii', man_path) + man_cmd = 'man %s -P cat %s' % ('--encoding=ascii' if HAS_ENCODING_ARG else '', man_path) try: man_output = stem.util.system.call(man_cmd, env = {'MANWIDTH': '10000000'})

1 0

[stem/master] bsd, mac and slackware don't have --encoding arg, so we should use negation
by atagar＠torproject.org 11 Sep '17

11 Sep '17

commit b528fe436411ee7b001214fef386dc7a45163197 Author: Edmund Wong <ewongbb(a)pw-wspx.org> Date: Mon Sep 11 11:16:02 2017 +0800 bsd, mac and slackware don't have --encoding arg, so we should use negation --- stem/manual.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/manual.py b/stem/manual.py index e436c866..2dd55747 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -84,7 +84,7 @@ Category = stem.util.enum.Enum('GENERAL', 'CLIENT', 'RELAY', 'DIRECTORY', 'AUTHO GITWEB_MANUAL_URL = 'https://gitweb.torproject.org/tor.git/plain/doc/tor.1.txt' CACHE_PATH = os.path.join(os.path.dirname(__file__), 'cached_tor_manual.sqlite') DATABASE = None # cache database connections -HAS_ENCODING_ARG = stem.util.system.is_mac() or stem.util.system.is_bsd() or stem.util.system.is_slackware() +HAS_ENCODING_ARG = not stem.util.system.is_mac() and not stem.util.system.is_bsd() and not stem.util.system.is_slackware() SCHEMA_VERSION = 1 # version of our scheme, bump this if you change the following SCHEMA = (

1 0