[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 0c9cd7c487ac75d9505f46e5ff42087d383eb1b4 Merge: 76b55fde8 2e74edb53 Author: Nick Mathewson Date: Wed Mar 6 14:29:29 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-03-04 | 4 + src/config/geoip | 12163 - src/config/geoip6| 2251 ++--- 3 files changed, 8221 insertions(+), 6197 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 76b55fde815f3f61161ba21adf90154fc2e53907 Merge: be71cce9f 7786198ee Author: teor Date: Fri Mar 1 14:15:59 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 3313444ef08b891d344b1965a7776260c02f27ab Merge: 6c966b894 4d9eb4dd0 Author: teor Date: Thu Feb 28 10:45:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug29599 | 3 +++ src/test/test_shared_random.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 6c966b894c2115d18ad5aecc7d02e7b96fea1daf Merge: fb309f6eb 4417ac880 Author: teor Date: Wed Feb 27 09:37:36 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug29145| 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/test/test-memwipe.c index 89d946d50,c650b99c8..4beb61369 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@@ -39,10 -36,11 +39,11 @@@ const char *s = NULL sum += (unsigned char)buf[i]; \ } -#ifdef __OpenBSD__ +#ifdef OpenBSD /* Disable some of OpenBSD's malloc protections for this test. This helps * us do bad things, such as access freed buffers, without crashing. */ - const char *malloc_options="sufjj"; + extern const char *malloc_options; + const char *malloc_options = "sufjj"; #endif static unsigned ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 7ead2af622b968e3dc843de0d49a8b3898e53506 Merge: 4d7a0a131 a3f9ddcf0 Author: Nick Mathewson Date: Tue Feb 12 09:56:49 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-02-05 | 4 + src/config/geoip | 22020 - src/config/geoip6| 2401 +++-- 3 files changed, 16972 insertions(+), 7453 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit d1c0dbabfaa2d26839af55c834677b667479b369 Merge: 4cca7fb99 dd6c2b0ad Author: Nick Mathewson Date: Wed Jan 23 09:50:38 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 "ours" merge to avoid dropping non-broken changes files after removal of merged 0.2.9 changes files. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 4cca7fb99b814d772587facbabfc9b5ad5b40d45 Merge: b5fdb91ad 89a0b7774 Author: Nick Mathewson Date: Fri Jan 18 12:25:08 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug29029 | 5 + src/or/rendmid.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit ba71b178655fcec2ad55383987001d2fd6a3873d Merge: fee2eaf2d 445d6750f Author: Nick Mathewson Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599 ++--- src/config/geoip6| 1764 --- 3 files changed, 7458 insertions(+), 6909 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit fee2eaf2d4b401c0e6d879224bf42992a780085a Merge: bf8bb9c52 73de7b4bc Author: Nick Mathewson Date: Fri Jan 4 15:04:58 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 93019b4787e71a56d3d3f3bc89f65919930f1dda Merge: c1f919158 3b5188576 Author: Nick Mathewson Date: Tue Dec 11 10:00:22 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/ticket24803 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit c1f9191581eae2d04a4ffacf7a7066a16c9f5eae Merge: 00341d97f 4991b2931 Author: Nick Mathewson Date: Tue Dec 11 09:41:04 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/ticket24803 | 5 + src/or/fallback_dirs.inc | 581 ++- 2 files changed, 333 insertions(+), 253 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 00341d97f356142619865218b2ff6a6ae95dca5d Merge: ffc7b81b5 57798eb1c Author: Nick Mathewson Date: Thu Dec 6 09:26:32 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++-- src/config/geoip6| 3151 +- 3 files changed, 8147 insertions(+), 5108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit cbe04d455016233f4759fe281c07dd7db6096c2a Merge: aebe8a82c 8569166c7 Author: Nick Mathewson Date: Thu Nov 15 16:54:16 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug24104| 4 ++ src/or/rephist.c| 7 ++- src/or/rephist.h| 5 +- src/or/router.c | 25 +++-- src/test/log_test_helpers.c | 23 +++- src/test/log_test_helpers.h | 8 ++- src/test/test_router.c | 124 +++- 7 files changed, 179 insertions(+), 17 deletions(-) diff --cc src/or/rephist.c index 43494692c,2844c4d74..67e4d3150 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@@ -3205,4 -3292,4 +3205,3 @@@ rep_hist_free_all(void tor_assert_nonfatal(rephist_total_alloc == 0); tor_assert_nonfatal_once(rephist_total_num == 0); } -- diff --cc src/or/rephist.h index 507272159,6d35ac67f..3e64a3de4 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@@ -111,30 -119,5 +111,29 @@@ extern int onion_handshakes_requested[M extern int onion_handshakes_assigned[MAX_ONION_HANDSHAKE_TYPE+1]; #endif -#endif - +/** + * Represents the type of a cell for padding accounting + */ +typedef enum padding_type_t { +/** A RELAY_DROP cell */ +PADDING_TYPE_DROP, +/** A CELL_PADDING cell */ +PADDING_TYPE_CELL, +/** Total counts of padding and non-padding together */ +PADDING_TYPE_TOTAL, +/** Total cell counts for all padding-enabled channels */ +PADDING_TYPE_ENABLED_TOTAL, +/** CELL_PADDING counts for all padding-enabled channels */ +PADDING_TYPE_ENABLED_CELL +} padding_type_t; + +/** The amount of time over which the padding cell counts were counted */ +#define REPHIST_CELL_PADDING_COUNTS_INTERVAL (24*60*60) +void rep_hist_padding_count_read(padding_type_t type); +void rep_hist_padding_count_write(padding_type_t type); +char *rep_hist_get_padding_count_lines(void); +void rep_hist_reset_padding_counts(void); +void rep_hist_prep_published_padding_counts(time_t now); +void rep_hist_padding_count_timers(uint64_t num_timers); + +#endif /* !defined(TOR_REPHIST_H) */ - diff --cc src/test/log_test_helpers.c index d5a39cfee,c5368b6cb..1ad01afc8 --- a/src/test/log_test_helpers.c +++ b/src/test/log_test_helpers.c @@@ -238,4 -258,4 +258,3 @@@ mock_dump_saved_logs(void escaped(m->generated_msg)); } SMARTLIST_FOREACH_END(m); } -- diff --cc src/test/log_test_helpers.h index 70c584eb3,a087b913f..f74028a8a --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@@ -101,5 -106,5 +106,4 @@@ void mock_dump_saved_logs(void) assert_log_predicate(!mock_saved_log_has_entry(), \ "expected log to not contain entries"); -#endif - +#endif /* !defined(TOR_LOG_TEST_HELPERS_H) */ - diff --cc src/test/test_router.c index 4e96e2453,51055a336..84473822a --- a/src/test/test_router.c +++ b/src/test/test_router.c @@@ -8,105 -7,136 +8,227 @@@ **/ #include "or.h" +#include "config.h" +#include "crypto_curve25519.h" +#include "crypto_ed25519.h" + #include "hibernate.h" -#include "log_test_helpers.h" + #include "main.h" + #include "rephist.h" #include "router.h" +#include "routerlist.h" + +/* Test suite stuff */ #include "test.h" ++#include "log_test_helpers.h" + +NS_DECL(const routerinfo_t *, router_get_my_routerinfo, (void)); + +static routerinfo_t* mock_routerinfo; + +static const routerinfo_t* +NS(router_get_my_routerinfo)(void) +{ + crypto_pk_t* ident_key; + crypto_pk_t* tap_key; + time_t now; + + if (!mock_routerinfo) { +/* Mock the published timestamp, otherwise router_dump_router_to_string() + * will poop its pants. */ +time(); + +/* We'll need keys, or router_dump_router_to_string() would return NULL. */ +ident_key = pk_generate(0); +tap_key = pk_generate(0); + +tor_assert(ident_key != NULL); +tor_assert(tap_key != NULL); + +mock_routerinfo = tor_malloc_zero(sizeof(routerinfo_t)); +mock_routerinfo->nickname = tor_strdup("ConlonNancarrow"); +mock_routerinfo->addr = 123456789; +mock_routerinfo->or_port = 443; +mock_routerinfo->platform = tor_strdup("unittest"); +mock_routerinfo->cache_info.published_on = now; +mock_routerinfo->identity_pkey = crypto_pk_dup_key(ident_key); +mock_routerinfo->onion_pkey = crypto_pk_dup_key(tap_key); +mock_routerinfo->bandwidthrate = 9001; +mock_routerinfo->bandwidthburst = 9002; + } + + return mock_routerinfo; +} + +/* If no distribution option was set, then check_bridge_distribution_setting() + * should have set it to "any". */ +static void +test_router_dump_router_to_string_no_bridge_distribution_method(void *arg) +{ + const char* needle = "bridge-distribution-request any"; + or_options_t* options = get_options_mutable(); + routerinfo_t* router = NULL; + curve25519_keypair_t ntor_keypair; + ed25519_keypair_t signing_keypair; + char* desc = NULL; +
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 54d1a2d80537e9f9a90dcca18c9e616f73809f58 Merge: 93b6d4137 7f042cbc0 Author: Nick Mathewson Date: Tue Nov 13 08:27:17 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug28413 | 4 src/common/aes.c | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --cc src/common/aes.c index 5d0841dfa,8ab2d2fc6..4d4a2d773 --- a/src/common/aes.c +++ b/src/common/aes.c @@@ -402,5 -401,4 +402,4 @@@ aes_set_iv(aes_cnt_cipher_t *cipher, co memcpy(cipher->ctr_buf.buf, iv, 16); } -#endif +#endif /* defined(USE_EVP_AES_CTR) */ - ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 93b6d4137491cffc906e34dcd3cd4d284ad89e2f Merge: d0c3723c3 46796623f Author: Nick Mathewson Date: Sun Nov 11 18:05:45 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 src/common/tortls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit d0c3723c38e0dba2ec1474c1c3ed75c6d0a7099f Merge: c06b7f090 5ba3d09a8 Author: Nick Mathewson Date: Sun Nov 11 11:57:52 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2018-11-06 | 4 + src/config/geoip | 22164 +++-- src/config/geoip6| 2572 -- 3 files changed, 13068 insertions(+), 11672 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit c06b7f090cfe49cef1b174d69277534eb0441696 Merge: 6bd069630 45e0004b6 Author: Nick Mathewson Date: Fri Nov 9 10:49:47 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug28245| 6 ++ configure.ac| 1 + src/common/tortls.c | 17 + 3 files changed, 24 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
commit bcc1a7180870368b69d51706226c2f667c482506 Merge: 038bc21f8 0a824bd88 Author: Nick Mathewson Date: Wed Oct 31 11:01:40 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug27948| 6 ++ src/test/bt_test.py | 10 ++ 2 files changed, 12 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits