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

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 15 Apr '16

15 Apr '16

commit 693fdeb737076767de6c6ba8019ec1d8bbe2b173 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 15 00:45:19 2016 +0000 Update translations for https_everywhere_completed --- zh_HK/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/ssl-observatory.dtd b/zh_HK/ssl-observatory.dtd index 9037c2c..2facd94 100644 --- a/zh_HK/ssl-observatory.dtd +++ b/zh_HK/ssl-observatory.dtd @@ -39,7 +39,7 @@ to turn it on?">--> "見到新嘅憑證時，告知觀測站你連線到邊一個ISP"> <!ENTITY ssl-observatory.prefs.asn_tooltip -"呢樣會抽取並回傳你網絡嘅自治系統號碼(Autonomous System Number)。咁會協助我哋定位對https嘅攻擊，並判定我哋所觀測到嚟自伊朗同敘利亞等地網絡嘅攻擊係唔係較為常見。"> +"呢樣會抽取並回傳你網絡嘅自治系統號碼(Autonomous System Number)。咁會協助我哋定位對https嘅攻擊，並判定我哋所觀測到嚟自伊朗同敘利亞等地網絡嘅攻擊係咪較為常見。"> <!ENTITY ssl-observatory.prefs.show_cert_warning "當觀測站偵測到未被你瀏覽器攔截到嘅被撤銷憑證時顯示警告">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 15 Apr '16

15 Apr '16

commit 1bef8d037fd6c3dc28b07fd27284da47ee5f3030 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 15 00:45:15 2016 +0000 Update translations for https_everywhere --- zh_HK/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/ssl-observatory.dtd b/zh_HK/ssl-observatory.dtd index 9037c2c..2facd94 100644 --- a/zh_HK/ssl-observatory.dtd +++ b/zh_HK/ssl-observatory.dtd @@ -39,7 +39,7 @@ to turn it on?">--> "見到新嘅憑證時，告知觀測站你連線到邊一個ISP"> <!ENTITY ssl-observatory.prefs.asn_tooltip -"呢樣會抽取並回傳你網絡嘅自治系統號碼(Autonomous System Number)。咁會協助我哋定位對https嘅攻擊，並判定我哋所觀測到嚟自伊朗同敘利亞等地網絡嘅攻擊係唔係較為常見。"> +"呢樣會抽取並回傳你網絡嘅自治系統號碼(Autonomous System Number)。咁會協助我哋定位對https嘅攻擊，並判定我哋所觀測到嚟自伊朗同敘利亞等地網絡嘅攻擊係咪較為常見。"> <!ENTITY ssl-observatory.prefs.show_cert_warning "當觀測站偵測到未被你瀏覽器攔截到嘅被撤銷憑證時顯示警告">

1 0

[tor/master] Add a BUG macro for usage in if checks.
by nickm＠torproject.org 14 Apr '16

14 Apr '16

commit 532820b11c9d0566b45b3dd19f01cf3e16d984ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 12 10:10:44 2016 -0400 Add a BUG macro for usage in if checks. --- src/common/util_bug.c | 3 ++- src/common/util_bug.h | 14 ++++++++++++++ src/or/connection.c | 6 ++---- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/common/util_bug.c b/src/common/util_bug.c index 606c665..e3e1d6d 100644 --- a/src/common/util_bug.c +++ b/src/common/util_bug.c @@ -26,7 +26,7 @@ tor_assertion_failed_(const char *fname, unsigned int line, log_backtrace(LOG_ERR, LD_BUG, buf); } - +/** Helper for tor_assert_nonfatal: report the assertion failure. */ void tor_bug_occurred_(const char *fname, unsigned int line, const char *func, const char *expr, @@ -50,3 +50,4 @@ tor_bug_occurred_(const char *fname, unsigned int line, } log_backtrace(LOG_WARN, LD_BUG, buf); } + diff --git a/src/common/util_bug.h b/src/common/util_bug.h index ce54266..a5f78f2 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -51,6 +51,11 @@ /* Non-fatal bug assertions. The "unreached" variants mean "this line should * never be reached." The "once" variants mean "Don't log a warning more than * once". + * + * The 'BUG' macro checks a boolean condition and logs an error message if it + * is true. Example usage: + * if (BUG(x == NULL)) + * return -1; */ #ifdef ALL_BUGS_ARE_FATAL @@ -58,11 +63,16 @@ #define tor_assert_nonfatal(cond) tor_assert((cond)) #define tor_assert_nonfatal_unreached_once() tor_assert(0) #define tor_assert_nonfatal_once(cond) tor_assert((cond)) +#define BUG(cond) \ + ((cond) ? \ + (tor_assertion_failed_(SHORT_FILE__,__LINE__,__func__,#cond), abort(), 1) \ + : 0) #elif defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) #define tor_assert_nonfatal_unreached() STMT_NIL #define tor_assert_nonfatal(cond) ((void)(cond)) #define tor_assert_nonfatal_unreached_once() STMT_NIL #define tor_assert_nonfatal_once(cond) ((void)(cond)) +#define BUG(cond) ((cond) ? 1 : 0) #else /* Normal case, !ALL_BUGS_ARE_FATAL, !DISABLE_ASSERTS_IN_UNIT_TESTS */ #define tor_assert_nonfatal_unreached() STMT_BEGIN \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, NULL, 0); \ @@ -86,6 +96,10 @@ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1); \ } \ STMT_END +#define BUG(cond) \ + ((cond) ? \ + (tor_bug_occurred_(SHORT_FILE__,__LINE__,__func__,#cond,0), 1) \ + : 0) #endif /** Define this if you want Tor to crash when any problem comes up, diff --git a/src/or/connection.c b/src/or/connection.c index 78178f9..1bd1a92 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -665,9 +665,7 @@ connection_free,(connection_t *conn)) return; tor_assert(!connection_is_on_closeable_list(conn)); tor_assert(!connection_in_array(conn)); - if (conn->linked_conn) { - log_err(LD_BUG, "Called with conn->linked_conn still set."); - tor_fragile_assert(); + if (BUG(conn->linked_conn)) { conn->linked_conn->linked_conn = NULL; if (! conn->linked_conn->marked_for_close && conn->linked_conn->reading_from_linked_conn) @@ -3644,7 +3642,7 @@ connection_read_to_buf(connection_t *conn, ssize_t *max_to_read, * take us over our read allotment, but really we shouldn't be * believing that SSL bytes are the same as TCP bytes anyway. */ int r2 = read_to_buf_tls(or_conn->tls, pending, conn->inbuf); - if (r2<0) { + if (BUG(r2<0)) { log_warn(LD_BUG, "apparently, reading pending bytes can fail."); return -1; }

1 0

[tor/master] Add new tor_assert_nonfatal*() macros.
by nickm＠torproject.org 14 Apr '16

14 Apr '16

commit a885271c08d2337b35c203c0b27509d0aa32dbf6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 5 09:40:51 2016 -0400 Add new tor_assert_nonfatal*() macros. Unlike tor_assert(), these macros don't abort the process. They're good for checking conditions we want to warn about, but which don't warrant a full crash. This commit also changes the default implementation for tor_fragile_assert() to tor_assert_nonfatal_unreached_once(). Closes ticket 18613. --- changes/assert_nonfatal | 5 +++++ src/common/util_bug.c | 24 ++++++++++++++++++++++++ src/common/util_bug.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- src/or/main.c | 8 +++----- src/or/policies.c | 2 +- src/or/rephist.c | 4 ++-- 6 files changed, 82 insertions(+), 10 deletions(-) diff --git a/changes/assert_nonfatal b/changes/assert_nonfatal new file mode 100644 index 0000000..0cbee44 --- /dev/null +++ b/changes/assert_nonfatal @@ -0,0 +1,5 @@ + o Minor features (safety, debugging): + + * Add a set of macros to check nonfatal assertions, for internal + use. Migrating more of our checks to these should help us avoid + needless crash bugs. Closes ticket 18613. diff --git a/src/common/util_bug.c b/src/common/util_bug.c index 139d139..606c665 100644 --- a/src/common/util_bug.c +++ b/src/common/util_bug.c @@ -26,3 +26,27 @@ tor_assertion_failed_(const char *fname, unsigned int line, log_backtrace(LOG_ERR, LD_BUG, buf); } + +void +tor_bug_occurred_(const char *fname, unsigned int line, + const char *func, const char *expr, + int once) +{ + char buf[256]; + const char *once_str = once ? + " (Future instances of this warning will be silenced.)": ""; + if (! expr) { + log_warn(LD_BUG, "%s:%u: %s: This line should not have been reached.%s", + fname, line, func, once_str); + tor_snprintf(buf, sizeof(buf), + "Line unexpectedly reached at %s at %s:%u", + func, fname, line); + } else { + log_warn(LD_BUG, "%s:%u: %s: Non-fatal assertion %s failed.%s", + fname, line, func, expr, once_str); + tor_snprintf(buf, sizeof(buf), + "Non-fatal assertion %s failed in %s at %s:%u", + expr, func, fname, line); + } + log_backtrace(LOG_WARN, LD_BUG, buf); +} diff --git a/src/common/util_bug.h b/src/common/util_bug.h index 5414c53..ce54266 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -46,13 +46,58 @@ } STMT_END #endif +#define tor_assert_unreached() tor_assert(0) + +/* Non-fatal bug assertions. The "unreached" variants mean "this line should + * never be reached." The "once" variants mean "Don't log a warning more than + * once". + */ + +#ifdef ALL_BUGS_ARE_FATAL +#define tor_assert_nonfatal_unreached() tor_assert(0) +#define tor_assert_nonfatal(cond) tor_assert((cond)) +#define tor_assert_nonfatal_unreached_once() tor_assert(0) +#define tor_assert_nonfatal_once(cond) tor_assert((cond)) +#elif defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) +#define tor_assert_nonfatal_unreached() STMT_NIL +#define tor_assert_nonfatal(cond) ((void)(cond)) +#define tor_assert_nonfatal_unreached_once() STMT_NIL +#define tor_assert_nonfatal_once(cond) ((void)(cond)) +#else /* Normal case, !ALL_BUGS_ARE_FATAL, !DISABLE_ASSERTS_IN_UNIT_TESTS */ +#define tor_assert_nonfatal_unreached() STMT_BEGIN \ + tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, NULL, 0); \ + STMT_END +#define tor_assert_nonfatal(cond) STMT_BEGIN \ + if (PREDICT_UNLIKELY(!(cond))) { \ + tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 0); \ + } \ + STMT_END +#define tor_assert_nonfatal_unreached_once() STMT_BEGIN \ + static int warning_logged__ = 0; \ + if (!warning_logged__) { \ + warning_logged__ = 1; \ + tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, NULL, 1); \ + } \ + STMT_END +#define tor_assert_nonfatal_once(cond) STMT_BEGIN \ + static int warning_logged__ = 0; \ + if (!warning_logged__ && PREDICT_UNLIKELY(!(cond))) { \ + warning_logged__ = 1; \ + tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1); \ + } \ + STMT_END +#endif + /** Define this if you want Tor to crash when any problem comes up, * so you can get a coredump and track things down. */ -// #define tor_fragile_assert() tor_assert(0) -#define tor_fragile_assert() +// #define tor_fragile_assert() tor_assert_unreached(0) +#define tor_fragile_assert() tor_assert_nonfatal_unreached_once() void tor_assertion_failed_(const char *fname, unsigned int line, const char *func, const char *expr); +void tor_bug_occurred_(const char *fname, unsigned int line, + const char *func, const char *expr, + int once); #endif diff --git a/src/or/main.c b/src/or/main.c index a2cf5b1..7c5e685 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1643,8 +1643,8 @@ rotate_x509_certificate_callback(time_t now, const or_options_t *options) * TLS context. */ log_info(LD_GENERAL,"Rotating tls context."); if (router_initialize_tls_context() < 0) { - log_warn(LD_BUG, "Error reinitializing TLS context"); - tor_assert(0); + log_err(LD_BUG, "Error reinitializing TLS context"); + tor_assert_unreached(); } /* We also make sure to rotate the TLS connections themselves if they've @@ -2563,9 +2563,7 @@ run_main_loop_once(void) return -1; #endif } else { - if (ERRNO_IS_EINPROGRESS(e)) - log_warn(LD_BUG, - "libevent call returned EINPROGRESS? Please report."); + tor_assert_nonfatal_once(! ERRNO_IS_EINPROGRESS(e)); log_debug(LD_NET,"libevent call interrupted."); /* You can't trust the results of this poll(). Go back to the * top of the big for loop. */ diff --git a/src/or/policies.c b/src/or/policies.c index f9718b6..2703d7e 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -103,7 +103,7 @@ policy_expand_private(smartlist_t **policy) if (tor_addr_parse_mask_ports(private_nets[i], 0, &newpolicy.addr, &newpolicy.maskbits, &port_min, &port_max)<0) { - tor_assert(0); + tor_assert_unreached(); } smartlist_add(tmp, addr_policy_get_canonical_entry(&newpolicy)); } diff --git a/src/or/rephist.c b/src/or/rephist.c index fe0ca91..b94ad29 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -3214,7 +3214,7 @@ rep_hist_free_all(void) rep_hist_desc_stats_term(); total_descriptor_downloads = 0; - tor_assert(rephist_total_alloc == 0); - tor_assert(rephist_total_num == 0); + tor_assert_nonfatal(rephist_total_alloc == 0); + tor_assert_nonfatal_once(rephist_total_num == 0); }

1 0

[tor/master] Move tor_assert implementation into its own header/module.
by nickm＠torproject.org 14 Apr '16

14 Apr '16

commit 7865402106e9af273b9c887484b8371a899683ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Apr 3 16:48:44 2016 -0400 Move tor_assert implementation into its own header/module. --- src/common/include.am | 2 ++ src/common/util.c | 17 --------------- src/common/util.h | 41 +----------------------------------- src/common/util_bug.c | 28 +++++++++++++++++++++++++ src/common/util_bug.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+), 57 deletions(-) diff --git a/src/common/include.am b/src/common/include.am index 5afb30d..f978eee 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -68,6 +68,7 @@ LIBOR_A_SOURCES = \ src/common/log.c \ src/common/memarea.c \ src/common/util.c \ + src/common/util_bug.c \ src/common/util_format.c \ src/common/util_process.c \ src/common/sandbox.c \ @@ -139,6 +140,7 @@ COMMONHEADERS = \ src/common/torlog.h \ src/common/tortls.h \ src/common/util.h \ + src/common/util_bug.h \ src/common/util_format.h \ src/common/util_process.h \ src/common/workqueue.h diff --git a/src/common/util.c b/src/common/util.c index 2351faf..de6867e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -105,23 +105,6 @@ #endif /* ===== - * Assertion helper. - * ===== */ -/** Helper for tor_assert: report the assertion failure. */ -void -tor_assertion_failed_(const char *fname, unsigned int line, - const char *func, const char *expr) -{ - char buf[256]; - log_err(LD_BUG, "%s:%u: %s: Assertion %s failed; aborting.", - fname, line, func, expr); - tor_snprintf(buf, sizeof(buf), - "Assertion %s failed in %s at %s:%u", - expr, func, fname, line); - log_backtrace(LOG_ERR, LD_BUG, buf); -} - -/* ===== * Memory management * ===== */ #ifdef USE_DMALLOC diff --git a/src/common/util.h b/src/common/util.h index ebcf88b..814c862 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -22,6 +22,7 @@ /* for the correct alias to struct stat */ #include <sys/stat.h> #endif +#include "util_bug.h" #ifndef O_BINARY #define O_BINARY 0 @@ -33,41 +34,6 @@ #define O_NOFOLLOW 0 #endif -/* Replace assert() with a variant that sends failures to the log before - * calling assert() normally. - */ -#ifdef NDEBUG -/* Nobody should ever want to build with NDEBUG set. 99% of our asserts will - * be outside the critical path anyway, so it's silly to disable bug-checking - * throughout the entire program just because a few asserts are slowing you - * down. Profile, optimize the critical path, and keep debugging on. - * - * And I'm not just saying that because some of our asserts check - * security-critical properties. - */ -#error "Sorry; we don't support building with NDEBUG." -#endif - -/* Sometimes we don't want to use assertions during branch coverage tests; it - * leads to tons of unreached branches which in reality are only assertions we - * didn't hit. */ -#if defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) -#define tor_assert(a) STMT_BEGIN \ - (void)(a); \ - STMT_END -#else -/** Like assert(3), but send assertion failures to the log as well as to - * stderr. */ -#define tor_assert(expr) STMT_BEGIN \ - if (PREDICT_UNLIKELY(!(expr))) { \ - tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, #expr); \ - abort(); \ - } STMT_END -#endif - -void tor_assertion_failed_(const char *fname, unsigned int line, - const char *func, const char *expr); - /* If we're building with dmalloc, we want all of our memory allocation * functions to take an extra file/line pair of arguments. If not, not. * We define DMALLOC_PARAMS to the extra parameters to insert in the @@ -81,11 +47,6 @@ void tor_assertion_failed_(const char *fname, unsigned int line, #define DMALLOC_ARGS #endif -/** Define this if you want Tor to crash when any problem comes up, - * so you can get a coredump and track things down. */ -// #define tor_fragile_assert() tor_assert(0) -#define tor_fragile_assert() - /* Memory management */ void *tor_malloc_(size_t size DMALLOC_PARAMS) ATTR_MALLOC; void *tor_malloc_zero_(size_t size DMALLOC_PARAMS) ATTR_MALLOC; diff --git a/src/common/util_bug.c b/src/common/util_bug.c new file mode 100644 index 0000000..139d139 --- /dev/null +++ b/src/common/util_bug.c @@ -0,0 +1,28 @@ +/* Copyright (c) 2003, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2016, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file util_bug.c + **/ + +#include "orconfig.h" +#include "util_bug.h" +#include "torlog.h" +#include "backtrace.h" + +/** Helper for tor_assert: report the assertion failure. */ +void +tor_assertion_failed_(const char *fname, unsigned int line, + const char *func, const char *expr) +{ + char buf[256]; + log_err(LD_BUG, "%s:%u: %s: Assertion %s failed; aborting.", + fname, line, func, expr); + tor_snprintf(buf, sizeof(buf), + "Assertion %s failed in %s at %s:%u", + expr, func, fname, line); + log_backtrace(LOG_ERR, LD_BUG, buf); +} + diff --git a/src/common/util_bug.h b/src/common/util_bug.h new file mode 100644 index 0000000..5414c53 --- /dev/null +++ b/src/common/util_bug.h @@ -0,0 +1,58 @@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2016, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file util_bug.h + **/ + +#ifndef TOR_UTIL_BUG_H +#define TOR_UTIL_BUG_H + +#include "orconfig.h" +#include "compat.h" +#include "testsupport.h" + +/* Replace assert() with a variant that sends failures to the log before + * calling assert() normally. + */ +#ifdef NDEBUG +/* Nobody should ever want to build with NDEBUG set. 99% of our asserts will + * be outside the critical path anyway, so it's silly to disable bug-checking + * throughout the entire program just because a few asserts are slowing you + * down. Profile, optimize the critical path, and keep debugging on. + * + * And I'm not just saying that because some of our asserts check + * security-critical properties. + */ +#error "Sorry; we don't support building with NDEBUG." +#endif + +/* Sometimes we don't want to use assertions during branch coverage tests; it + * leads to tons of unreached branches which in reality are only assertions we + * didn't hit. */ +#if defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) +#define tor_assert(a) STMT_BEGIN \ + (void)(a); \ + STMT_END +#else +/** Like assert(3), but send assertion failures to the log as well as to + * stderr. */ +#define tor_assert(expr) STMT_BEGIN \ + if (PREDICT_UNLIKELY(!(expr))) { \ + tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, #expr); \ + abort(); \ + } STMT_END +#endif + +/** Define this if you want Tor to crash when any problem comes up, + * so you can get a coredump and track things down. */ +// #define tor_fragile_assert() tor_assert(0) +#define tor_fragile_assert() + +void tor_assertion_failed_(const char *fname, unsigned int line, + const char *func, const char *expr); + +#endif +

1 0

[tor/master] Add an IF_BUG_ONCE macro, since that's a pretty common pattern too.
by nickm＠torproject.org 14 Apr '16

14 Apr '16

commit a86ed1d717482f52e0b0ab390151401c28079d87 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 12 10:35:16 2016 -0400 Add an IF_BUG_ONCE macro, since that's a pretty common pattern too. --- src/common/util_bug.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/common/util_bug.h b/src/common/util_bug.h index a5f78f2..2613450 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -102,6 +102,39 @@ : 0) #endif +#ifdef __GNUC__ +#define IF_BUG_ONCE__(cond,var) \ + if (({ \ + static int var = 0; \ + int bool_result = (cond); \ + if (bool_result && !var) { \ + var = 1; \ + tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1); \ + } \ + var; })) +#else +#define IF_BUG_ONCE__(cond,var) \ + static int var = 0; \ + if ((cond) ? \ + (var ? 1 : \ + (var=1, \ + tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1), \ + 1)) \ + : 0) +#endif +#define IF_BUG_ONCE_VARNAME_(a) \ + warning_logged_on_ ## a ## __ +#define IF_BUG_ONCE_VARNAME__(a) \ + IF_BUG_ONCE_VARNAME_(a) + +/** This macro behaves as 'if (bug(x))', except that it only logs its + * warning once, no matter how many times it triggers. + */ + +#define IF_BUG_ONCE(cond) \ + IF_BUG_ONCE__((cond), \ + IF_BUG_ONCE_VARNAME__(__LINE__)) + /** Define this if you want Tor to crash when any problem comes up, * so you can get a coredump and track things down. */ // #define tor_fragile_assert() tor_assert_unreached(0)

1 0

[tor/master] Merge branch 'assert_nonfatal_squashed'
by nickm＠torproject.org 14 Apr '16

14 Apr '16

commit 0e354ad45966d29ff4cd75854dbd1715270a2168 Merge: 525307c a86ed1d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 14 16:25:21 2016 -0400 Merge branch 'assert_nonfatal_squashed' changes/assert_nonfatal | 5 ++ src/common/include.am | 2 + src/common/util.c | 17 ------ src/common/util.h | 41 +------------ src/common/util_bug.c | 53 +++++++++++++++++ src/common/util_bug.h | 150 ++++++++++++++++++++++++++++++++++++++++++++++++ src/or/connection.c | 6 +- src/or/main.c | 8 +-- src/or/policies.c | 2 +- src/or/rephist.c | 4 +- 10 files changed, 219 insertions(+), 69 deletions(-)

1 0

[metrics-db/master] Stop using deprecated parts of metrics-lib.
by karsten＠torproject.org 14 Apr '16

14 Apr '16

commit 0b398e9adbe7d6a56da3f8d0fa4bd52ff4f43308 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 14 10:01:03 2016 +0200 Stop using deprecated parts of metrics-lib. We're currently using two metrics-lib types that have been deprecated: - `org.torproject.descriptor.impl.DescriptorParseException` and - `org.torproject.descriptor.ExitListEntry`. It's easy to avoid using those parts and move to non-deprecated types. This also removes the last dependency on a type in the impl package. Implements #18818. --- src/org/torproject/collector/exitlists/ExitListDownloader.java | 9 +++++---- src/org/torproject/collector/relaydescs/ArchiveWriter.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/collector/exitlists/ExitListDownloader.java b/src/org/torproject/collector/exitlists/ExitListDownloader.java index b5425fb..4f202d8 100644 --- a/src/org/torproject/collector/exitlists/ExitListDownloader.java +++ b/src/org/torproject/collector/exitlists/ExitListDownloader.java @@ -24,8 +24,7 @@ import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorSourceFactory; import org.torproject.descriptor.ExitList; -import org.torproject.descriptor.ExitListEntry; -import org.torproject.descriptor.impl.DescriptorParseException; +import org.torproject.descriptor.DescriptorParseException; import org.torproject.collector.main.Configuration; import org.torproject.collector.main.LockFile; import org.torproject.collector.main.LoggingConfiguration; @@ -128,8 +127,10 @@ public class ExitListDownloader extends Thread { return; } ExitList parsedExitList = (ExitList) parsedDescriptors.get(0); - for (ExitListEntry entry : parsedExitList.getExitListEntries()) { - maxScanMillis = Math.max(maxScanMillis, entry.getScanMillis()); + for (ExitList.Entry entry : parsedExitList.getEntries()) { + for (long scanMillis : entry.getExitAddresses().values()) { + maxScanMillis = Math.max(maxScanMillis, scanMillis); + } } } catch (DescriptorParseException e) { logger.log(Level.WARNING, "Could not parse downloaded exit list", diff --git a/src/org/torproject/collector/relaydescs/ArchiveWriter.java b/src/org/torproject/collector/relaydescs/ArchiveWriter.java index 560687c..da83bd1 100644 --- a/src/org/torproject/collector/relaydescs/ArchiveWriter.java +++ b/src/org/torproject/collector/relaydescs/ArchiveWriter.java @@ -29,7 +29,7 @@ import java.util.logging.Logger; import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorSourceFactory; -import org.torproject.descriptor.impl.DescriptorParseException; +import org.torproject.descriptor.DescriptorParseException; import org.torproject.collector.main.Configuration; import org.torproject.collector.main.LockFile; import org.torproject.collector.main.LoggingConfiguration;

1 0

[user-manual/master] Make wording stronger against installing additional add-ons in the Tor
by colin＠torproject.org 14 Apr '16

14 Apr '16

commit 6624999fc5aae16f36252aac3da50a705d64ac88 Author: Colin Childs <colin(a)torproject.org> Date: Thu Apr 14 00:11:09 2016 -0500 Make wording stronger against installing additional add-ons in the Tor Browser --- C/plugins.page | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/C/plugins.page b/C/plugins.page index 7e2486e..94e9ed3 100644 --- a/C/plugins.page +++ b/C/plugins.page @@ -64,8 +64,9 @@ are compatible with Firefox can also be installed in Tor Browser. However, the only add-ons that have been tested for use with Tor Browser are those included by default. Installing any other browser add-ons may break functionality in Tor Browser or cause more serious -problems that affect your privacy and security, and is done at your own -risk. +problems that affect your privacy and security. It is strongly discouraged +to install additional add-ons, and the Tor Project will not offer support +for these configurations. </p> </section> </page>

1 0

[user-manual/master] Dropping FlashProxy reference from transports.page
by colin＠torproject.org 14 Apr '16

14 Apr '16

commit 05cf2333bb423112e0447c64d9adac8e6dd32b01 Author: Colin Childs <colin(a)torproject.org> Date: Wed Apr 13 23:59:42 2016 -0500 Dropping FlashProxy reference from transports.page --- C/transports.page | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/C/transports.page b/C/transports.page index b7e652d..92b064d 100644 --- a/C/transports.page +++ b/C/transports.page @@ -94,21 +94,6 @@ being developed. </p> </td> </tr> - <tr> - <td> - <p> - Flashproxy - </p> - </td> - <td> - <p> - Flashproxy is for advanced users. It sends your traffic - through other peoples’ web browsers. To set it up, you need to - read the <a href="https://trac.torproject.org/projects/tor/wiki/FlashProxyHowto">flash - proxy how-to</a>. - </p> - </td> - </tr> </table> </section> </page>

1 0