June 2016 - tor-commits - lists.torproject.org

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 10 Jun '16

10 Jun '16

commit 0575238144d9ae9294bf48095f56c3baf45065fe Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 10 07:15:42 2016 +0000 Update translations for tails-misc --- zh_TW.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index aae44f7..c019d35 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-25 20:25+0200\n" -"PO-Revision-Date: 2016-05-27 10:12+0000\n" +"POT-Creation-Date: 2016-06-06 14:26+0200\n" +"PO-Revision-Date: 2016-06-10 07:12+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 09 Jun '16

09 Jun '16

commit 086fe46e12ba2124c565aa6771b16a9247f6542e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 9 18:45:52 2016 +0000 Update translations for tails-misc_completed --- hu.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hu.po b/hu.po index 034627e..f349f59 100644 --- a/hu.po +++ b/hu.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-25 20:25+0200\n" -"PO-Revision-Date: 2016-05-27 10:12+0000\n" +"POT-Creation-Date: 2016-06-06 14:26+0200\n" +"PO-Revision-Date: 2016-06-09 18:41+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 09 Jun '16

09 Jun '16

commit bf62df61f7bfb034034adf0573cc56fc4b1990dd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 9 18:45:43 2016 +0000 Update translations for tails-misc --- hu.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hu.po b/hu.po index 034627e..f349f59 100644 --- a/hu.po +++ b/hu.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-25 20:25+0200\n" -"PO-Revision-Date: 2016-05-27 10:12+0000\n" +"POT-Creation-Date: 2016-06-06 14:26+0200\n" +"PO-Revision-Date: 2016-06-09 18:41+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n"

1 0

[stem/master] Note Rust tor controller lib
by atagar＠torproject.org 09 Jun '16

09 Jun '16

commit aded23b5dd75c63a1691ee1f72d06b9318dd0dfd Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 9 09:39:19 2016 -0700 Note Rust tor controller lib Still a work in progress, but neat having a controller for another language out there! https://github.com/Dhole/rust-tor-controller --- docs/download.rst | 3 +-- docs/faq.rst | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/download.rst b/docs/download.rst index dfa234d..43602d0 100644 --- a/docs/download.rst +++ b/docs/download.rst @@ -159,8 +159,7 @@ Download % wget https://aur.archlinux.org/packages/st/stem/stem.tar.gz % tar -xvf stem.tar.gz - % cd stem - % makepkg --install + % cd stem; makepkg --install * - .. image:: /_static/section/download/slackware.png :target: http://slackbuilds.org/repository/14.1/python/stem/ diff --git a/docs/faq.rst b/docs/faq.rst index f559045..582dfbf 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -234,17 +234,18 @@ The following are the functional controller libraries I'm aware of. Dates are for highly active development. If I missed one then please `let me know <https://www.atagar.com/contact/>`_! -========================================================== ================ ======================= -Library Language Developed -========================================================== ================ ======================= -`Stem <https://stem.torproject.org/>`_ Python October 2011 - Present -`Txtorcon <https://txtorcon.readthedocs.org/>`_ Python (Twisted) February 2012 - Present -`TorCtl <https://gitweb.torproject.org/pytorctl.git>`_ Python July 2008 - November 2011 -`PHP TorCtl <https://github.com/dunglas/php-torcontrol/>`_ PHP February 2013 -`JTorCtl <https://gitweb.torproject.org/jtorctl.git>`_ Java June 2005 - May 2009 -`Orc <https://github.com/sycamoreone/orc>`_ Go January 2015 -`Bulb <https://github.com/Yawning/bulb>`_ Go March 2015 -========================================================== ================ ======================= +================================================================== ================ ======================= +Library Language Developed +================================================================== ================ ======================= +`Stem <https://stem.torproject.org/>`_ Python October 2011 - Present +`Txtorcon <https://txtorcon.readthedocs.org/>`_ Python (Twisted) February 2012 - Present +`TorCtl <https://gitweb.torproject.org/pytorctl.git>`_ Python July 2008 - November 2011 +`PHP TorCtl <https://github.com/dunglas/php-torcontrol/>`_ PHP February 2013 +`JTorCtl <https://gitweb.torproject.org/jtorctl.git>`_ Java June 2005 - May 2009 +`Orc <https://github.com/sycamoreone/orc>`_ Go January 2015 +`Bulb <https://github.com/Yawning/bulb>`_ Go March 2015 +`Rust Controller <https://github.com/Dhole/rust-tor-controller>`_ Rust May 2016 +================================================================== ================ ======================= .. _what_license_is_stem_under:

1 0

[tor/master] Reduce make check-spaces noise
by andrea＠torproject.org 09 Jun '16

09 Jun '16

commit 9eeaeddbb1aa04248841890e244c4714f165522d Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Jun 9 11:50:25 2016 +0000 Reduce make check-spaces noise --- src/common/di_ops.c | 1 + src/common/di_ops.h | 3 ++- src/common/pubsub.h | 4 +++- src/common/util_bug.h | 4 ++-- src/or/connection_edge.c | 3 ++- src/or/rendcommon.c | 1 - src/or/routerlist.h | 3 ++- src/test/test-timers.c | 5 +++-- src/test/test_crypto.c | 10 ++++++---- 9 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/common/di_ops.c b/src/common/di_ops.c index e671af6..4ed49e1 100644 --- a/src/common/di_ops.c +++ b/src/common/di_ops.c @@ -271,3 +271,4 @@ select_array_member_cumulative_timei(const uint64_t *entries, int n_entries, return i_chosen; } + diff --git a/src/common/di_ops.h b/src/common/di_ops.h index f1050a0..0a15430 100644 --- a/src/common/di_ops.h +++ b/src/common/di_ops.h @@ -42,7 +42,8 @@ void dimap_add_entry(di_digest256_map_t **map, const uint8_t *key, void *val); void *dimap_search(const di_digest256_map_t *map, const uint8_t *key, void *dflt_val); -int select_array_member_cumulative_timei(const uint64_t *entries, int n_entries, +int select_array_member_cumulative_timei(const uint64_t *entries, + int n_entries, uint64_t total, uint64_t rand_val); #endif diff --git a/src/common/pubsub.h b/src/common/pubsub.h index 09e492e..bbb4f02 100644 --- a/src/common/pubsub.h +++ b/src/common/pubsub.h @@ -21,7 +21,9 @@ * unsigned priority); * int T_unsubscribe(const T_subscriber_t *) * - * Elsewhere you can say DECLARE_NOTIFY_PUBSUB_TOPIC(static, T), which declares: + * Elsewhere you can say DECLARE_NOTIFY_PUBSUB_TOPIC(static, T), which + * declares: + * * static int T_notify(T_event_data_t *, unsigned notify_flags); * static void T_clear(void); * diff --git a/src/common/util_bug.h b/src/common/util_bug.h index 36056aa..3f77e0a 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -104,14 +104,14 @@ #ifdef __GNUC__ #define IF_BUG_ONCE__(cond,var) \ - if (({ \ + if (( { \ static int var = 0; \ int bool_result = (cond); \ if (PREDICT_UNLIKELY(bool_result) && !var) { \ var = 1; \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1); \ } \ - PREDICT_UNLIKELY(bool_result); })) + PREDICT_UNLIKELY(bool_result); } )) #else #define IF_BUG_ONCE__(cond,var) \ static int var = 0; \ diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index c9aced7..799baa2 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1703,7 +1703,8 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, /* Fill in the rend_data field so we can start doing a connection to * a hidden service. */ rend_data_t *rend_data = ENTRY_TO_EDGE_CONN(conn)->rend_data = - rend_data_client_create(socks->address, NULL, (char *) cookie, auth_type); + rend_data_client_create(socks->address, NULL, (char *) cookie, + auth_type); if (rend_data == NULL) { return -1; } diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 56c49fe..01b0766 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1067,4 +1067,3 @@ rend_auth_decode_cookie(const char *cookie_in, uint8_t *cookie_out, return res; } - diff --git a/src/or/routerlist.h b/src/or/routerlist.h index d5a9b77..be242d6 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -221,7 +221,8 @@ int hex_digest_nickname_matches(const char *hexdigest, STATIC int choose_array_element_by_weight(const uint64_t *entries, int n_entries); STATIC void scale_array_elements_to_u64(uint64_t *entries_out, - const double *entries_in, int n_entries, + const double *entries_in, + int n_entries, uint64_t *total_out); STATIC const routerstatus_t *router_pick_directory_server_impl( dirinfo_type_t auth, int flags, diff --git a/src/test/test-timers.c b/src/test/test-timers.c index 8f5ba7b..0196ec1 100644 --- a/src/test/test-timers.c +++ b/src/test/test-timers.c @@ -23,10 +23,10 @@ #define MAX_DURATION 30 #define N_DISABLE 5 -static struct timeval fire_at[N_TIMERS] = {{0,0}}; +static struct timeval fire_at[N_TIMERS] = { {0,0} }; static int is_disabled[N_TIMERS] = {0}; static int fired[N_TIMERS] = {0}; -static struct timeval difference[N_TIMERS] = {{0,0}}; +static struct timeval difference[N_TIMERS] = { {0,0} }; static tor_timer_t *timers[N_TIMERS] = {NULL}; static int n_active_timers = 0; @@ -131,3 +131,4 @@ main(int argc, char **argv) timers_shutdown(); return ret; } + diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 0e82223..616b313 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -542,7 +542,8 @@ test_crypto_aes_ctr_testvec(void *arg) char plaintext[16*4]; base16_decode(key, sizeof(key), key16, strlen(key16)); base16_decode(iv, sizeof(iv), ctr16, strlen(ctr16)); - base16_decode(plaintext, sizeof(plaintext), plaintext16, strlen(plaintext16)); + base16_decode(plaintext, sizeof(plaintext), + plaintext16, strlen(plaintext16)); crypto_cipher_t *c = crypto_cipher_new_with_iv(key, iv); crypto_cipher_crypt_inplace(c, plaintext, sizeof(plaintext)); @@ -1396,9 +1397,11 @@ test_crypto_digest_names(void *arg) int i; for (i = 0; names[i].n; ++i) { tt_str_op(names[i].n, OP_EQ,crypto_digest_algorithm_get_name(names[i].a)); - tt_int_op(names[i].a, OP_EQ,crypto_digest_algorithm_parse_name(names[i].n)); + tt_int_op(names[i].a, + OP_EQ,crypto_digest_algorithm_parse_name(names[i].n)); } - tt_int_op(-1, OP_EQ, crypto_digest_algorithm_parse_name("TimeCubeHash-4444")); + tt_int_op(-1, OP_EQ, + crypto_digest_algorithm_parse_name("TimeCubeHash-4444")); done: ; } @@ -1887,7 +1890,6 @@ test_crypto_hkdf_sha256_testvecs(void *arg) tor_free(mem_op_hex_tmp); } - static void test_crypto_curve25519_impl(void *arg) {

1 0

[tor-messenger-build/master] Bump Tor Browser version to 6.0.1
by sukhbir＠torproject.org 09 Jun '16

09 Jun '16

commit 30ee77b91d13549a0cf1ced817f7c8fedf92b670 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jun 9 02:49:05 2016 -0400 Bump Tor Browser version to 6.0.1 --- projects/tor-browser/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index e0fa0f7..3933680 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 5.5.4 +version: 6.0.1 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files:

1 0

[tor-messenger-build/master] Bump Tor Launcher version to 0.2.8.5
by sukhbir＠torproject.org 09 Jun '16

09 Jun '16

commit 620dfb9a5ea20166832ed1d8c9278559f6b1687c Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jun 9 02:46:50 2016 -0400 Bump Tor Launcher version to 0.2.8.5 --- projects/tor-launcher/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 25c26b5..971e530 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.7.7 +version: 0.2.8.5 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: gk.gpg

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 08 Jun '16

08 Jun '16

commit f05f6fc542030ab2d55a1967ee674ee1dbd88742 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 8 22:45:50 2016 +0000 Update translations for tails-misc_completed --- nb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb.po b/nb.po index 4fbebe4..e125511 100644 --- a/nb.po +++ b/nb.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-25 20:25+0200\n" -"PO-Revision-Date: 2016-05-27 10:12+0000\n" +"POT-Creation-Date: 2016-06-06 14:26+0200\n" +"PO-Revision-Date: 2016-06-08 22:19+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 08 Jun '16

08 Jun '16

commit f4619f79214b1c7b6e781ea6b429e87389847daa Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 8 22:45:43 2016 +0000 Update translations for tails-misc --- nb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb.po b/nb.po index 4fbebe4..e125511 100644 --- a/nb.po +++ b/nb.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-25 20:25+0200\n" -"PO-Revision-Date: 2016-05-27 10:12+0000\n" +"POT-Creation-Date: 2016-06-06 14:26+0200\n" +"PO-Revision-Date: 2016-06-08 22:19+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n"

1 0

[nyx/master] Validate startup.events
by atagar＠torproject.org 08 Jun '16

08 Jun '16

commit fc08a1a26c5b4ad85b30e4cc4c2fb3e6cf67201b Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Tue Jun 7 21:58:50 2016 -0700 Validate startup.events --- nyx/panel/log.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 5fd0cdf..482b567 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -31,6 +31,27 @@ def conf_handler(key, value): return max(1000, value) +def validate_events(events): + """ + Check whether the events are any one of Tor runlevels, Nyx runlevels or + Tor events. If not, return the default events. + """ + valid_events = tor_controller().get_info('events/names').split() + accepted_events, invalid_events = set(), set() + + events = events.split(',') + for event in events: + if event in valid_events: + accepted_events.update([event]) + else: + invalid_events.update([event]) + + if invalid_events: + return ['NOTICE', 'WARN', 'ERR', 'NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR'] + else: + return accepted_events + + CONFIG = conf.config_dict('nyx', { 'attr.log_color': {}, 'cache.log_panel.size': 1000, @@ -68,7 +89,7 @@ class LogPanel(nyx.panel.DaemonPanel): def __init__(self): nyx.panel.DaemonPanel.__init__(self, 'log', UPDATE_RATE) - logged_events = CONFIG['startup.events'].split(',') + logged_events = validate_events(CONFIG['startup.events']) self._event_log = nyx.log.LogGroup(CONFIG['cache.log_panel.size'], group_by_day = True) self._event_log_paused = None self._event_types = nyx.log.listen_for_events(self._register_tor_event, logged_events)

1 0