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

[tor/master] Replace "people" with the appropriate network component in comments
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit d5df9fa2356ed1f9d38d659efa335bb9bb134228 Author: J. Ryan Stinnett <jryans(a)gmail.com> Date: Fri Dec 9 14:13:11 2016 -1000 Replace "people" with the appropriate network component in comments Fixes #18145. --- src/or/circuitbuild.c | 2 +- src/or/circuitstats.c | 2 +- src/or/circuituse.c | 2 +- src/or/config.c | 2 +- src/or/connection_edge.c | 2 +- src/or/dirserv.c | 6 +++--- src/or/dnsserv.c | 2 +- src/or/hibernate.c | 6 +++--- src/or/or.h | 2 +- src/or/router.c | 6 +++--- src/or/routerlist.c | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index f60a8bf..9bd0125 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1164,7 +1164,7 @@ circuit_extend(cell_t *cell, circuit_t *circ) /* Check if they asked us for 0000..0000. We support using * an empty fingerprint for the first hop (e.g. for a bridge relay), - * but we don't want to let people send us extend cells for empty + * but we don't want to let clients send us extend cells for empty * fingerprints -- a) because it opens the user up to a mitm attack, * and b) because it lets an attacker force the relay to hold open a * new TLS connection for each extend request. */ diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index 418acc0..6cb99e4 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -1431,7 +1431,7 @@ circuit_build_times_network_check_changed(circuit_build_times_t *cbt) #define MAX_TIMEOUT ((int32_t) (INT32_MAX/2)) /* Check to see if this has happened before. If so, double the timeout - * to give people on abysmally bad network connections a shot at access */ + * to give clients on abysmally bad network connections a shot at access */ if (cbt->timeout_ms >= circuit_build_times_get_initial_timeout()) { if (cbt->timeout_ms > MAX_TIMEOUT || cbt->close_ms > MAX_TIMEOUT) { log_warn(LD_CIRC, "Insanely large circuit build timeout value. " diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 04c5af9..e109cef 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -2598,7 +2598,7 @@ connection_ap_handshake_attach_circuit(entry_connection_t *conn) log_debug(LD_APP|LD_CIRC, "Attaching apconn to circ %u (stream %d sec old).", (unsigned)circ->base_.n_circ_id, conn_age); - /* print the circ's path, so people can figure out which circs are + /* print the circ's path, so clients can figure out which circs are * sucking. */ circuit_log_path(LOG_INFO,LD_APP|LD_CIRC,circ); diff --git a/src/or/config.c b/src/or/config.c index 6948bdb..a4d063d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1899,7 +1899,7 @@ options_act(const or_options_t *old_options) addressmap_clear_invalid_automaps(options); /* How long should we delay counting bridge stats after becoming a bridge? - * We use this so we don't count people who used our bridge thinking it is + * We use this so we don't count clients who used our bridge thinking it is * a relay. If you change this, don't forget to change the log message * below. It's 4 hours (the time it takes to stop being used by clients) * plus some extra time for clock skew. */ diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 3874d52..fb077bb 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1300,7 +1300,7 @@ connection_ap_handshake_rewrite(entry_connection_t *conn, * an internal address? If so, we should reject it if we're configured to * do so. */ if (options->ClientDNSRejectInternalAddresses) { - /* Don't let people try to do a reverse lookup on 10.0.0.1. */ + /* Don't let clients try to do a reverse lookup on 10.0.0.1. */ tor_addr_t addr; int ok; ok = tor_addr_parse_PTR_name( diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 399d5ea..e106628 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1102,7 +1102,7 @@ directory_caches_dir_info(const or_options_t *options) should_refuse_unknown_exits(options); } -/** Return 1 if we want to allow remote people to ask us directory +/** Return 1 if we want to allow remote clients to ask us directory * requests via the "begin_dir" interface, which doesn't require * having any separate port open. */ int @@ -2236,8 +2236,8 @@ dirserv_set_routerstatus_testing(routerstatus_t *rs) } /** Routerstatus rs is part of a group of routers that are on - * too narrow an IP-space. Clear out its flags: we don't want people - * using it. + * too narrow an IP-space. Clear out its flags since we don't want it be used + * because of its Sybil-like appearance. */ static void clear_status_flags_on_sybil(routerstatus_t *rs) diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index c5c0a88..8768b2a 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -284,7 +284,7 @@ dnsserv_reject_request(entry_connection_t *conn) } /** Look up the original name that corresponds to 'addr' in req. We use this - * to preserve case in order to facilitate people using 0x20-hacks to avoid + * to preserve case in order to facilitate clients using 0x20-hacks to avoid * DNS poisoning. */ static const char * evdns_get_orig_address(const struct evdns_server_request *req, diff --git a/src/or/hibernate.c b/src/or/hibernate.c index aaf5c4b..c2b3bbb 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -424,8 +424,8 @@ configure_accounting(time_t now) if (-0.50 <= delta && delta <= 0.50) { /* The start of the period is now a little later or earlier than we * remembered. That's fine; we might lose some bytes we could otherwise - * have written, but better to err on the side of obeying people's - * accounting settings. */ + * have written, but better to err on the side of obeying accounting + * settings. */ log_info(LD_ACCT, "Accounting interval moved by %.02f%%; " "that's fine.", delta*100); interval_end_time = start_of_accounting_period_after(now); @@ -896,7 +896,7 @@ hibernate_go_dormant(time_t now) log_notice(LD_ACCT,"Going dormant. Blowing away remaining connections."); /* Close all OR/AP/exit conns. Leave dir conns because we still want - * to be able to upload server descriptors so people know we're still + * to be able to upload server descriptors so clients know we're still * running, and download directories so we can detect if we're obsolete. * Leave control conns because we still want to be controllable. */ diff --git a/src/or/or.h b/src/or/or.h index 7e11bf0..0e508e9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3883,7 +3883,7 @@ typedef struct { uint64_t BandwidthBurst; /**< How much bandwidth, at maximum, are we willing * to use in a second? */ uint64_t MaxAdvertisedBandwidth; /**< How much bandwidth are we willing to - * tell people we have? */ + * tell other nodes we have? */ uint64_t RelayBandwidthRate; /**< How much bandwidth, on average, are we * willing to use for all relayed conns? */ uint64_t RelayBandwidthBurst; /**< How much bandwidth, at maximum, will we diff --git a/src/or/router.c b/src/or/router.c index 917caaa..2d8208a 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1178,9 +1178,9 @@ router_should_be_directory_server(const or_options_t *options, int dir_port) if (accounting_is_enabled(options) && get_options()->AccountingRule != ACCT_IN) { /* Don't spend bytes for directory traffic if we could end up hibernating, - * but allow DirPort otherwise. Some people set AccountingMax because - * they're confused or to get statistics. Directory traffic has a much - * larger effect on output than input so there is no reason to turn it + * but allow DirPort otherwise. Some relay operators set AccountingMax + * because they're confused or to get statistics. Directory traffic has a + * much larger effect on output than input so there is no reason to turn it * off if using AccountingRule in. */ int interval_length = accounting_get_interval_length(); uint32_t effective_bw = get_effective_bwrate(options); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 9bcca76..5fd16ed 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4483,7 +4483,7 @@ router_load_extrainfo_from_string(const char *s, const char *eos, ei->cache_info.identity_digest, DIGEST_LEN); smartlist_string_remove(requested_fingerprints, fp); - /* We silently let people stuff us with extrainfos we didn't ask for, + /* We silently let relays stuff us with extrainfos we didn't ask for, * so long as we would have wanted them anyway. Since we always fetch * all the extrainfos we want, and we never actually act on them * inside Tor, this should be harmless. */

1 0

[tor/master] Merge branch 'people-to-node-type'
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit 1bd562f1c4c165d0c8f60c8ed61122e7e247f86a Merge: b659ffe d5df9fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 12 09:50:31 2016 -0500 Merge branch 'people-to-node-type' src/or/circuitbuild.c | 2 +- src/or/circuitstats.c | 2 +- src/or/circuituse.c | 2 +- src/or/config.c | 2 +- src/or/connection_edge.c | 2 +- src/or/dirserv.c | 6 +++--- src/or/dnsserv.c | 2 +- src/or/hibernate.c | 6 +++--- src/or/or.h | 2 +- src/or/router.c | 6 +++--- src/or/routerlist.c | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-)

1 0

[tor/master] whitespace fix
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit 54069b97d39599fb54fb2fd29db44a104d7bd555 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 12 09:51:49 2016 -0500 whitespace fix --- src/test/test_config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index bf2beb8..1e0dc75 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4946,3 +4946,4 @@ struct testcase_t config_tests[] = { CONFIG_TEST(parse_log_severity, 0), END_OF_TESTCASES }; +

1 0

[tor/master] Merge remote-tracking branch 'jryans/log-severity'
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit b659ffe9ac371d9a72c148cd45191b1a60dae28d Merge: 1ad96ed 9b2b799 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 12 09:46:07 2016 -0500 Merge remote-tracking branch 'jryans/log-severity' changes/19965 | 3 +++ src/common/log.c | 4 +--- src/test/test_config.c | 29 ++++++++++++++++++++++++++++- 3 files changed, 32 insertions(+), 4 deletions(-)

1 0

[tor/master] Accept non-space whitespace characters in log severity syntax.
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit 9b2b799d82e00286145d42b9c59cb4f820e4f8c7 Author: J. Ryan Stinnett <jryans(a)gmail.com> Date: Sun Dec 4 22:26:52 2016 -0600 Accept non-space whitespace characters in log severity syntax. Adds a test_config_parse_log_severity unit test to verify behavior. Fixes #19965. --- changes/19965 | 3 +++ src/common/log.c | 4 +--- src/test/test_config.c | 29 ++++++++++++++++++++++++++++- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/changes/19965 b/changes/19965 new file mode 100644 index 0000000..904f5c9 --- /dev/null +++ b/changes/19965 @@ -0,0 +1,3 @@ + o Minor bugfix (configuration): + - Accept non-space whitespace characters after the severity level in the + `Log` option. Fixes bug 19965; bugfix on 0.2.1.1-alpha. diff --git a/src/common/log.c b/src/common/log.c index 3b0eb88..1c592c6 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -1319,10 +1319,8 @@ parse_log_severity_config(const char **cfg_ptr, if (got_an_unqualified_range > 1) return -1; - space = strchr(cfg, ' '); + space = find_whitespace(cfg); dash = strchr(cfg, '-'); - if (!space) - space = strchr(cfg, '\0'); if (dash && dash < space) { sev_lo = tor_strndup(cfg, dash-cfg); sev_hi = tor_strndup(dash+1, space-(dash+1)); diff --git a/src/test/test_config.c b/src/test/test_config.c index 2fc37b0..bf2beb8 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4890,6 +4890,33 @@ test_config_parse_port_config__ports__server_options(void *data) config_free_lines(config_port_valid); config_port_valid = NULL; } +static void +test_config_parse_log_severity(void *data) +{ + int ret; + const char *severity_log_lines[] = { + "debug file /tmp/debug.log", + "debug\tfile /tmp/debug.log", + "[handshake]debug [~net,~mm]info notice stdout", + "[handshake]debug\t[~net,~mm]info\tnotice\tstdout", + NULL + }; + int i; + log_severity_list_t *severity; + + (void) data; + + severity = tor_malloc(sizeof(log_severity_list_t)); + for (i = 0; severity_log_lines[i]; i++) { + memset(severity, 0, sizeof(log_severity_list_t)); + ret = parse_log_severity_config(&severity_log_lines[i], severity); + tt_int_op(ret, OP_EQ, 0); + } + + done: + tor_free(severity); +} + #define CONFIG_TEST(name, flags) \ { #name, test_config_ ## name, flags, NULL, NULL } @@ -4916,6 +4943,6 @@ struct testcase_t config_tests[] = { CONFIG_TEST(parse_port_config__ports__no_ports_given, 0), CONFIG_TEST(parse_port_config__ports__server_options, 0), CONFIG_TEST(parse_port_config__ports__ports_given, 0), + CONFIG_TEST(parse_log_severity, 0), END_OF_TESTCASES }; -

1 0

[tor/master] Merge remote-tracking branch 'rubiate/ticket20511'
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit 1ad96ed9cda1573cfd9f0a388ac28bfeaf3b62aa Merge: 9025991 d46c1b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 12 09:20:56 2016 -0500 Merge remote-tracking branch 'rubiate/ticket20511' changes/20511 | 3 +++ src/or/directory.c | 31 ++++++++++++++++++++++ src/or/networkstatus.c | 21 +++++++++++++-- src/or/networkstatus.h | 2 ++ src/test/test_dir_handle_get.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 115 insertions(+), 2 deletions(-)

1 0

[tor/master] Do not serve a consensus if it is too old
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit d46c1b49a459f1249ef358b3751ef656d9e19038 Author: rubiate <cb(a)viennan.net> Date: Thu Nov 10 10:16:18 2016 +1300 Do not serve a consensus if it is too old Closes ticket 20511. --- changes/20511 | 3 +++ src/or/directory.c | 31 ++++++++++++++++++++++ src/or/networkstatus.c | 21 +++++++++++++-- src/or/networkstatus.h | 2 ++ src/test/test_dir_handle_get.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 115 insertions(+), 2 deletions(-) diff --git a/changes/20511 b/changes/20511 new file mode 100644 index 0000000..d6e962e --- /dev/null +++ b/changes/20511 @@ -0,0 +1,3 @@ + o Minor feature: + - Relays and bridges will now refuse to serve the consensus they have if + they know it is too old for a client to use. Closes ticket 20511. diff --git a/src/or/directory.c b/src/or/directory.c index ba6d38c..b5c9d49 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2939,6 +2939,28 @@ handle_get_frontpage(dir_connection_t *conn, const get_handler_args_t *args) return 0; } +/** Warn that the consensus v of type flavor is too old and will + * not be served to clients. Rate-limit the warning to avoid logging an entry + * on every request. + */ +static void +warn_consensus_is_too_old(networkstatus_t *v, const char *flavor, time_t now) +{ +#define TOO_OLD_WARNING_INTERVAL (60*60) + static ratelim_t warned = RATELIM_INIT(TOO_OLD_WARNING_INTERVAL); + char timestamp[ISO_TIME_LEN+1]; + char *dupes; + + if ((dupes = rate_limit_log(&warned, now))) { + format_local_iso_time(timestamp, v->valid_until); + log_warn(LD_DIRSERV, "Our %s%sconsensus is too old, so we will not " + "serve it to clients. It was valid until %s local time and we " + "continued to serve it for up to 24 hours after it expired.%s", + flavor ? flavor : "", flavor ? " " : "", timestamp, dupes); + tor_free(dupes); + } +} + /** Helper function for GET /tor/status-vote/current/consensus */ static int @@ -2983,6 +3005,15 @@ handle_get_current_consensus(dir_connection_t *conn, v = networkstatus_get_latest_consensus_by_flavor(flav); + if (v && !networkstatus_consensus_reasonably_live(v, now)) { + write_http_status_line(conn, 404, "Consensus is too old"); + warn_consensus_is_too_old(v, flavor, now); + smartlist_free(dir_fps); + geoip_note_ns_response(GEOIP_REJECT_NOT_FOUND); + tor_free(flavor); + goto done; + } + if (v && want_fps && !client_likes_consensus(v, want_fps)) { write_http_status_line(conn, 404, "Consensus not signed by sufficient " diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index ed888fb..fde0b18 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1342,6 +1342,24 @@ networkstatus_get_live_consensus,(time_t now)) return NULL; } +/** Determine if consensus is valid or expired recently enough that + * we can still use it. + * + * Return 1 if the consensus is reasonably live, or 0 if it is too old. + */ +int +networkstatus_consensus_reasonably_live(networkstatus_t *consensus, time_t now) +{ +#define REASONABLY_LIVE_TIME (24*60*60) + if (BUG(!consensus)) + return 0; + + if (now <= consensus->valid_until + REASONABLY_LIVE_TIME) + return 1; + + return 0; +} + /* XXXX remove this in favor of get_live_consensus. But actually, * leave something like it for bridge users, who need to not totally * lose if they spend a while fetching a new consensus. */ @@ -1350,12 +1368,11 @@ networkstatus_get_live_consensus,(time_t now)) networkstatus_t * networkstatus_get_reasonably_live_consensus(time_t now, int flavor) { -#define REASONABLY_LIVE_TIME (24*60*60) networkstatus_t *consensus = networkstatus_get_latest_consensus_by_flavor(flavor); if (consensus && consensus->valid_after <= now && - now <= consensus->valid_until+REASONABLY_LIVE_TIME) + networkstatus_consensus_reasonably_live(consensus, now)) return consensus; else return NULL; diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 71f36b6..172c0ea 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -79,6 +79,8 @@ MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus,(void)); MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus_by_flavor, (consensus_flavor_t f)); MOCK_DECL(networkstatus_t *, networkstatus_get_live_consensus,(time_t now)); +int networkstatus_consensus_reasonably_live(networkstatus_t *consensus, + time_t now); networkstatus_t *networkstatus_get_reasonably_live_consensus(time_t now, int flavor); MOCK_DECL(int, networkstatus_consensus_is_bootstrapping,(time_t now)); diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index c215fee..a0868f9 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -30,6 +30,7 @@ #include "dirserv.h" #include "torgzip.h" #include "dirvote.h" +#include "log_test_helpers.h" #ifdef _WIN32 /* For mkdir() */ @@ -53,6 +54,7 @@ ENABLE_GCC_WARNING(overlength-strings) #define NOT_FOUND "HTTP/1.0 404 Not found\r\n\r\n" #define BAD_REQUEST "HTTP/1.0 400 Bad request\r\n\r\n" #define SERVER_BUSY "HTTP/1.0 503 Directory busy, try again later\r\n\r\n" +#define TOO_OLD "HTTP/1.0 404 Consensus is too old\r\n\r\n" #define NOT_ENOUGH_CONSENSUS_SIGNATURES "HTTP/1.0 404 " \ "Consensus not signed by sufficient number of requested authorities\r\n\r\n" @@ -1617,6 +1619,7 @@ test_dir_handle_get_status_vote_current_consensus_ns_not_enough_sigs(void* d) mock_ns_val = tor_malloc_zero(sizeof(networkstatus_t)); mock_ns_val->flavor = FLAV_NS; mock_ns_val->voters = smartlist_new(); + mock_ns_val->valid_until = time(NULL); /* init mock */ init_mock_options(); @@ -1696,6 +1699,62 @@ test_dir_handle_get_status_vote_current_consensus_ns_not_found(void* data) or_options_free(mock_options); mock_options = NULL; } +static void +test_dir_handle_get_status_vote_current_consensus_too_old(void *data) +{ + dir_connection_t *conn = NULL; + char *header = NULL; + (void)data; + + mock_ns_val = tor_malloc_zero(sizeof(networkstatus_t)); + mock_ns_val->flavor = FLAV_MICRODESC; + mock_ns_val->valid_until = time(NULL) - (60 * 60 * 24) - 1; + + init_mock_options(); + MOCK(get_options, mock_get_options); + MOCK(connection_write_to_buf_impl_, connection_write_to_buf_mock); + MOCK(networkstatus_get_latest_consensus_by_flavor, mock_ns_get_by_flavor); + + conn = new_dir_conn(); + + setup_capture_of_logs(LOG_WARN); + + tt_int_op(0, OP_EQ, directory_handle_command_get(conn, + GET("/tor/status-vote/current/consensus-microdesc"), NULL, 0)); + + fetch_from_buf_http(TO_CONN(conn)->outbuf, &header, MAX_HEADERS_SIZE, + NULL, NULL, 1, 0); + tt_assert(header); + tt_str_op(TOO_OLD, OP_EQ, header); + + expect_log_msg_containing("too old"); + + tor_free(header); + teardown_capture_of_logs(); + + setup_capture_of_logs(LOG_WARN); + + tt_int_op(0, OP_EQ, directory_handle_command_get(conn, + GET("/tor/status-vote/current/consensus"), NULL, 0)); + + fetch_from_buf_http(TO_CONN(conn)->outbuf, &header, MAX_HEADERS_SIZE, + NULL, NULL, 1, 0); + tt_assert(header); + tt_str_op(TOO_OLD, OP_EQ, header); + + expect_no_log_entry(); + + done: + teardown_capture_of_logs(); + UNMOCK(networkstatus_get_latest_consensus_by_flavor); + UNMOCK(connection_write_to_buf_impl_); + UNMOCK(get_options); + connection_free_(TO_CONN(conn)); + tor_free(header); + tor_free(mock_ns_val); + or_options_free(mock_options); mock_options = NULL; +} + NS_DECL(int, geoip_get_country_by_addr, (const tor_addr_t *addr)); int @@ -2481,6 +2540,7 @@ struct testcase_t dir_handle_get_tests[] = { DIR_HANDLE_CMD(status_vote_next_authority, 0), DIR_HANDLE_CMD(status_vote_current_consensus_ns_not_enough_sigs, 0), DIR_HANDLE_CMD(status_vote_current_consensus_ns_not_found, 0), + DIR_HANDLE_CMD(status_vote_current_consensus_too_old, 0), DIR_HANDLE_CMD(status_vote_current_consensus_ns_busy, 0), DIR_HANDLE_CMD(status_vote_current_consensus_ns, 0), DIR_HANDLE_CMD(status_vote_current_d_not_found, 0),

1 0

[tor/master] Fix a few warnings from lintChanges
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit 9025991a8d16b28e0b1ed875aab76630f9aa1715 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 12 08:31:05 2016 -0500 Fix a few warnings from lintChanges --- changes/bug20530 | 4 ++-- changes/bug20646 | 6 +++--- changes/feature17238 | 4 ++-- changes/feature20552 | 2 +- changes/ticket18873 | 13 ++++++++----- changes/ticket20717 | 5 ++--- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/changes/bug20530 b/changes/bug20530 index c21d5fb..85d1b01 100644 --- a/changes/bug20530 +++ b/changes/bug20530 @@ -1,4 +1,4 @@ - o Minor Fixes (Windows): + o Minor bugfixes (Windows): - Check for getpagesize before using it to mmap files. This fixes compilation in some MinGW environments. Fixes bug 20530; bugfix on - commit bf72878 in tor-0.1.2.1-alpha, reported by "ice". + 0.1.2.1-alpha. Reported by "ice". diff --git a/changes/bug20646 b/changes/bug20646 index 42e319f..7cff38f 100644 --- a/changes/bug20646 +++ b/changes/bug20646 @@ -1,5 +1,5 @@ - o Minor bugfix (util) + o Minor bugfix (util): - When finishing writing a file to disk, if we were about to replace the file with the temporary file created before and we fail to replace it, - remove the temporary file so it doesn't stay on disk. Closes #20646; - bugfix on tor-0.2.0.7-alpha; Patch by fk. + remove the temporary file so it doesn't stay on disk. Fixes bug 20646; + bugfix on tor-0.2.0.7-alpha. Patch by fk. diff --git a/changes/feature17238 b/changes/feature17238 index eba9fb7..88dfee9 100644 --- a/changes/feature17238 +++ b/changes/feature17238 @@ -1,6 +1,6 @@ - o Major features (onion service) + o Major features (onion services): - Tor relays now support the HSDir version 3 protocol meaning they can store and serve v3 descriptors. This is part of the next generation onion service work detailled in proposal 224. The tor daemon also contains all the necessary code to encode and decode a v3 descriptor but - it's currently only used by the directory subsystem. Closes #17238. + it's currently only used by the directory subsystem. Closes ticket 17238. diff --git a/changes/feature20552 b/changes/feature20552 index 1195480..75fbdde 100644 --- a/changes/feature20552 +++ b/changes/feature20552 @@ -1,4 +1,4 @@ o Minor features (ed25519 link handshake): - Advertise support for the ed25519 link handshake using the subprotocol-versions mechanism, so that clients can tell which - relays can identity themselves by Ed25519 ID. + relays can identity themselves by Ed25519 ID. Closes ticket 20552. diff --git a/changes/ticket18873 b/changes/ticket18873 index f1d9bef..11a867d 100644 --- a/changes/ticket18873 +++ b/changes/ticket18873 @@ -1,7 +1,10 @@ o Code simplification and refactoring: - - Extracted dummy_origin_circuit_new so it can be used by other test + - Refactor circuit_predict_and_launch_new for readability and + testability. Closes ticket 18873. + - Extract magic numbers in circuituse.c into defined variables. + - Refactor circuit_is_available_for_use to remove unnecessary check. + + o Minor features (unit tests): + - Extract dummy_origin_circuit_new so it can be used by other test functions. - - Refactor circuit_predict_and_launch_new for readability and testability. - - Added unit tests for extracted functions. - - Extracted magic numbers in circuituse.c into defined variables. - - Refactor circuit_is_available_for_use to remove unnecessary check + - Add unit tests circuit_predict_and_launch_new. diff --git a/changes/ticket20717 b/changes/ticket20717 index c896f8a..71d3edd 100644 --- a/changes/ticket20717 +++ b/changes/ticket20717 @@ -1,4 +1,3 @@ o Code simplification and refactoring: - - Refactors the hashing API to return negative values for errors as is done - as a standard throughout the codebase. - - Refactors calling functions to expect negative values for errors. + - Refactor the hashing API to return negative values for errors, as is done + as throughout the codebase. Closes ticket 20717.

1 0

[tor-browser-bundle/hardened-builds] Release preparations for 6.5a6-hardened
by gk＠torproject.org 12 Dec '16

12 Dec '16

commit 8fe01a6bcd6972fe18c0d3da8e4aef4719456022 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 12 13:08:35 2016 +0000 Release preparations for 6.5a6-hardened Changelog update, version bumps, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 25 +++++++++++++++++++++++++ gitian/versions.alpha | 8 ++++---- tools/update-responses/config.yml | 9 +++++---- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 84eacc6..def8f6a 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,28 @@ +Tor Browser 6.5a6-hardened -- December 14 2016 + * All Platforms + * Update Firefox to 45.6.0esr + * Tor to 0.2.9.7-rc + * Update Torbutton to 1.9.6.9 + * Bug 16622: Timezone spoofing moved to tor-browser.git + * Bug 20701: Allow the directory listing stylesheet in the content policy + * Bug 20556: Use pt-BR strings from now on + * Bug 20614: Add links to Tor Browser User Manual + * Bug 20414: Fix non-rendering arrow on OS X + * Bug 20728: Fix bad preferences.xul dimensions + * Bug 20318: Remove helpdesk link from about:tor + * Bug 20753: Remove obsolete StartPage locale strings + * Bug 20947: Donation banner improvements + * Translation updates + * Update HTTPS-Everywhere to 5.2.8 + * Bug 16622: Spoof timezone with Firefox patch + * Bug 20707: Fix broken preferences tab in non-en-US alpha bundles + * Bug 20709: Fix wrong update URL in alpha bundles + * Bug 20556: Start using pt-BR instead of pt-PT for Portuguese + * Bug 20809: Use non-/html search engine URL for DuckDuckGo search plugins + * Bug 20837: Activate iat-mode for certain obfs4 bridges + * Bug 20838: Uncomment NX01 default obfs4 bridge + * Bug 20840: Rotate ports a third time for default obfs4 bridges + Tor Browser 6.5a5-hardened -- December 1 2016 * All Platforms * Update Firefox to 45.5.1esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 858597e..f64f8d7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,15 +14,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.5.1esr +FIREFOX_VERSION=45.6.0esr TORBROWSER_UPDATE_CHANNEL=hardened TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 -TOR_TAG=tor-0.2.9.5-alpha +TOR_TAG=tor-0.2.9.7-rc TORLAUNCHER_TAG=0.2.11.1 -TORBUTTON_TAG=1.9.6.7 -HTTPSE_TAG=5.2.7 +TORBUTTON_TAG=1.9.6.9 +HTTPSE_TAG=5.2.8 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 1fcbd57..54c4082 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,7 +20,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - hardened: 6.5a5-hardened + hardened: 6.5a6-hardened release: 6.0.1 versions: 6.0.1: @@ -33,11 +33,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.5a5-hardened: - platformVersion: 45.5.1 - detailsURL: https://blog.torproject.org/blog/tor-browser-65a5-hardened-released + 6.5a6-hardened: + platformVersion: 45.6.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-65a6-hardened-released incremental_from: - 6.5a4-hardened + - 6.5a5-hardened migrate_archs: osx32: osx64 osx32:

1 0

[tor/release-0.2.9] version bump: 0.2.9.7-rc-dev
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit 8384f4d26f06f26b8ccae329b2d2ac5cdeb366d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 12 08:24:37 2016 -0500 version bump: 0.2.9.7-rc-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 699eafc..94774ec 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.7-rc]) +AC_INIT([tor],[0.2.9.7-rc-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index f5cb477..d3d793b 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.9.7-rc" +!define VERSION "0.2.9.7-rc-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 641f25a..5773d04 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.7-rc" +#define VERSION "0.2.9.7-rc-dev"

1 0