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

[snowflake/master] Typo.
by dcf＠torproject.org 26 Mar '16

26 Mar '16

commit 6efb5cb8ef56bc84a56a8244f81a0817d7202912 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 26 10:41:38 2016 -0700 Typo. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b909df5..28481ac 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ abundance of ephemeral and short-lived (and special!) volunteer proxies... ##### -- Testing directly via WebRTC Server -- -Ordinarily, the WebrTC client plugin speaks with a Broker which helps +Ordinarily, the WebRTC client plugin speaks with a Broker which helps match and signal with a browser proxy, which ultimately speaks with a default websocket server.

1 0

[tor/master] helper script to highlight undocumented members
by nickm＠torproject.org 26 Mar '16

26 Mar '16

commit 560450f2fbce3cf6967851e51be72cfddd35d5c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 26 10:31:59 2016 -0400 helper script to highlight undocumented members --- scripts/maint/locatemissingdoxygen.py | 74 +++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/scripts/maint/locatemissingdoxygen.py b/scripts/maint/locatemissingdoxygen.py new file mode 100755 index 0000000..797bf81 --- /dev/null +++ b/scripts/maint/locatemissingdoxygen.py @@ -0,0 +1,74 @@ +#!/usr/bin/python + +""" + This script parses the stderr output of doxygen and looks for undocumented + stuff. By default, it just counts the undocumented things per file. But with + the -A option, it rewrites the files to stick in /*DOCDOC*/ comments + to highlight the undocumented stuff. +""" + +import os +import re +import shutil +import sys + +warning_pattern = re.compile(r'^([^:]+):(\d+): warning: (.*) is not documented') + +def readDoxygenOutput(f): + " yields (cfilename, lineno, thingname) " + for line in f: + m = warning_pattern.match(line) + if m: + yield m.groups() + +warnings = {} + +def buildWarnings(): + for fn, lineno, what in list(readDoxygenOutput(sys.stdin)): + warnings.setdefault(fn, []).append( (int(lineno), what) ) + +def count(fn): + if os.path.abspath(fn) not in warnings: + print "0\t%s"%fn + else: + n = len(warnings[os.path.abspath(fn)]) + print "%d\t%s"%(n,fn) + +def getIndentation(line): + s = line.lstrip() + return line[:len(line)-len(s)] + +def annotate(filename): + if os.path.abspath(filename) not in warnings: + return + with open(filename) as f: + lines = f.readlines() + w = warnings[os.path.abspath(filename)][:] + w.sort() + w.reverse() + + for lineno, what in w: + lineno -= 1 # list is 0-indexed. + if 'DOCDOC' in lines[lineno]: + continue + ind = getIndentation(lines[lineno]) + lines.insert(lineno, "%s/* DOCDOC %s */\n"%(ind,what)) + + shutil.copy(filename, filename+".orig") + with open(filename, 'w') as f: + for l in lines: + f.write(l) + + +if __name__ == '__main__': + if len(sys.argv) == 1: + print "Usage: locatemissingdoxygen.py [-A] filename... <doxygen_log" + sys.exit(1) + buildWarnings() + if sys.argv[1] == '-A': + del sys.argv[1] + func = annotate + else: + func = count + for fname in sys.argv[1:]: + func(fname)

1 0

[tor/master] add a little documentation to memarea. (I have been testing a tool.)
by nickm＠torproject.org 26 Mar '16

26 Mar '16

commit cc90b57b045596a3ace603b23c6c932c841cb050 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 26 10:09:19 2016 -0400 add a little documentation to memarea. (I have been testing a tool.) --- src/common/memarea.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/common/memarea.c b/src/common/memarea.c index 5d5dc0c..cfba80b 100644 --- a/src/common/memarea.c +++ b/src/common/memarea.c @@ -21,6 +21,8 @@ * value. */ #define MEMAREA_ALIGN SIZEOF_VOID_P +/** A value which, when masked out of a pointer, produces a maximally aligned + * pointer. */ #if MEMAREA_ALIGN == 4 #define MEMAREA_ALIGN_MASK 3lu #elif MEMAREA_ALIGN == 8 @@ -31,6 +33,7 @@ #if defined(__GNUC__) && defined(FLEXIBLE_ARRAY_MEMBER) #define USE_ALIGNED_ATTRIBUTE +/** Name for the 'memory' member of a memory chunk. */ #define U_MEM mem #else #define U_MEM u.mem @@ -83,12 +86,14 @@ typedef struct memarea_chunk_t { * greater than or equal to mem+mem_size, this chunk is * full. */ #ifdef USE_ALIGNED_ATTRIBUTE + /** Actual content of the memory chunk. */ char mem[FLEXIBLE_ARRAY_MEMBER] __attribute__((aligned(MEMAREA_ALIGN))); #else union { char mem[1]; /**< Memory space in this chunk. */ void *void_for_alignment_; /**< Dummy; used to make sure mem is aligned. */ - } u; + } u; /**< Union used to enforce alignment when we don't have support for + * doing it right. */ #endif } memarea_chunk_t;

1 0

[tor/master] Do not treat "DOCDOC" as doxygen.
by nickm＠torproject.org 26 Mar '16

26 Mar '16

commit 4895d8288c04577ffc1aed92ee4bffbabbd23295 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 26 10:11:45 2016 -0400 Do not treat "DOCDOC" as doxygen. --- src/common/crypto_curve25519.c | 4 ++-- src/common/sandbox.c | 2 +- src/common/sandbox.h | 2 +- src/or/channel.c | 2 +- src/or/channel.h | 2 +- src/or/circuituse.c | 2 +- src/or/connection_edge.c | 2 +- src/or/connection_or.h | 2 +- src/or/ext_orport.c | 2 +- src/or/or.h | 4 ++-- src/or/relay.c | 2 +- src/or/rendcache.c | 4 ++-- src/or/routerkeys.c | 2 +- src/or/routerlist.c | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c index baa573b..57c878b 100644 --- a/src/common/crypto_curve25519.c +++ b/src/common/crypto_curve25519.c @@ -157,7 +157,7 @@ curve25519_keypair_generate(curve25519_keypair_t *keypair_out, return 0; } -/** DOCDOC */ +/* DOCDOC */ int curve25519_keypair_write_to_file(const curve25519_keypair_t *keypair, const char *fname, @@ -180,7 +180,7 @@ curve25519_keypair_write_to_file(const curve25519_keypair_t *keypair, return r; } -/** DOCDOC */ +/* DOCDOC */ int curve25519_keypair_read_from_file(curve25519_keypair_t *keypair_out, char **tag_out, diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 96429ce..70c5bbd 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1082,7 +1082,7 @@ sandbox_intern_string(const char *str) return str; } -/** DOCDOC */ +/* DOCDOC */ static int prot_strings_helper(strmap_t *locations, char **pr_mem_next_p, diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 4918ad0..2defd8b 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -152,7 +152,7 @@ int sandbox_cfg_allow_open_filename(sandbox_cfg_t **cfg, char *file); int sandbox_cfg_allow_chmod_filename(sandbox_cfg_t **cfg, char *file); int sandbox_cfg_allow_chown_filename(sandbox_cfg_t **cfg, char *file); -/**DOCDOC*/ +/* DOCDOC */ int sandbox_cfg_allow_rename(sandbox_cfg_t **cfg, char *file1, char *file2); /** diff --git a/src/or/channel.c b/src/or/channel.c index 519d106..5f69a08 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2868,7 +2868,7 @@ channel_assert_counter_consistency(void) (n_channel_bytes_in_queues + n_channel_bytes_passed_to_lower_layer)); } -/** DOCDOC */ +/* DOCDOC */ static int is_destroy_cell(channel_t *chan, const cell_queue_entry_t *q, circid_t *circid_out) diff --git a/src/or/channel.h b/src/or/channel.h index 1fb4310..129c0c2 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -182,7 +182,7 @@ struct channel_s { * space should we use? */ circ_id_type_bitfield_t circ_id_type:2; - /** DOCDOC*/ + /* DOCDOC */ unsigned wide_circ_ids:1; /** For how many circuits are we n_chan? What about p_chan? */ diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 64fcc30..31003ea 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1674,7 +1674,7 @@ circuit_launch(uint8_t purpose, int flags) return circuit_launch_by_extend_info(purpose, NULL, flags); } -/** DOCDOC */ +/* DOCDOC */ static int have_enough_path_info(int need_exit) { diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index f680e1d..754e976 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -904,7 +904,7 @@ connection_ap_mark_as_non_pending_circuit(entry_connection_t *entry_conn) smartlist_remove(pending_entry_connections, entry_conn); } -/** DOCDOC */ +/* DOCDOC */ void connection_ap_warn_and_unmark_if_pending_circ(entry_connection_t *entry_conn, const char *where) diff --git a/src/or/connection_or.h b/src/or/connection_or.h index 53e1f96..e2ec47a 100644 --- a/src/or/connection_or.h +++ b/src/or/connection_or.h @@ -100,7 +100,7 @@ var_cell_t *var_cell_new(uint16_t payload_len); var_cell_t *var_cell_copy(const var_cell_t *src); void var_cell_free(var_cell_t *cell); -/** DOCDOC */ +/* DOCDOC */ #define MIN_LINK_PROTO_FOR_WIDE_CIRC_IDS 4 #endif diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c index 584abf6..aa1b3e2 100644 --- a/src/or/ext_orport.c +++ b/src/or/ext_orport.c @@ -178,7 +178,7 @@ connection_ext_or_auth_neg_auth_type(connection_t *conn) return 1; } -/** DOCDOC */ +/* DOCDOC */ STATIC int handle_client_auth_nonce(const char *client_nonce, size_t client_nonce_len, char **client_hash_out, diff --git a/src/or/or.h b/src/or/or.h index 301901e..111d098 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1358,7 +1358,7 @@ typedef struct listener_connection_t { * in the v3 handshake. The subject key must be a 1024-bit RSA key; it * must be signed by the identity key */ #define OR_CERT_TYPE_AUTH_1024 3 -/** DOCDOC */ +/* DOCDOC */ #define OR_CERT_TYPE_RSA_ED_CROSSCERT 7 /**@}*/ @@ -3789,7 +3789,7 @@ typedef struct { * and try a new circuit if the stream has been * waiting for this many seconds. If zero, use * our default internal timeout schedule. */ - int MaxOnionQueueDelay; /**<DOCDOC*/ + int MaxOnionQueueDelay; /*< DOCDOC */ int NewCircuitPeriod; /**< How long do we use a circuit before building * a new one? */ int MaxCircuitDirtiness; /**< Never use circs that were first used more than diff --git a/src/or/relay.c b/src/or/relay.c index 7022c4b..fb8c8e7 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2374,7 +2374,7 @@ packed_cell_mem_cost(void) return sizeof(packed_cell_t); } -/** DOCDOC */ +/* DOCDOC */ STATIC size_t cell_queues_get_total_allocation(void) { diff --git a/src/or/rendcache.c b/src/or/rendcache.c index 8b2d3ce..f8206cd 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -53,7 +53,7 @@ STATIC digestmap_t *rend_cache_v2_dir = NULL; * only rely on the usability of intro points from an internal state. */ STATIC strmap_t *rend_cache_failure = NULL; -/** DOCDOC */ +/* DOCDOC */ STATIC size_t rend_cache_total_allocation = 0; /** Initializes the service descriptor cache. @@ -78,7 +78,7 @@ rend_cache_entry_allocation(const rend_cache_entry_t *e) return sizeof(*e) + e->len + sizeof(*e->parsed); } -/** DOCDOC */ +/* DOCDOC */ size_t rend_cache_get_total_allocation(void) { diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 34e9fc5..efb3cbb 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -923,7 +923,7 @@ load_ed_keys(const or_options_t *options, time_t now) return -1; } -/**DOCDOC*/ +/* DOCDOC */ int generate_ed_link_cert(const or_options_t *options, time_t now) { diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 31da561..3c9023e 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -662,7 +662,7 @@ static const char *BAD_SIGNING_KEYS[] = { NULL, }; -/** DOCDOC */ +/* DOCDOC */ int authority_cert_is_blacklisted(const authority_cert_t *cert) {

1 0

[tor/master] Fix all doxygen warnings (other than missing docs)
by nickm＠torproject.org 26 Mar '16

26 Mar '16

commit dd572dac34c0ba9e3c360d462d77a09e4f584511 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 26 09:53:12 2016 -0400 Fix all doxygen warnings (other than missing docs) --- src/common/crypto_ed25519.c | 2 +- src/or/dircollate.c | 8 ++++---- src/or/main.c | 2 +- src/or/microdesc.c | 3 ++- src/or/torcert.c | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/common/crypto_ed25519.c b/src/common/crypto_ed25519.c index 1d0cfd0..ea2d8e3 100644 --- a/src/common/crypto_ed25519.c +++ b/src/common/crypto_ed25519.c @@ -414,7 +414,7 @@ ed25519_seckey_write_to_file(const ed25519_secret_key_t *seckey, /** * Read seckey unencrypted from filename, storing it into - * seckey_out. Set *tag_out</> to the tag it was marked with. + * seckey_out. Set *tag_out to the tag it was marked with. * Return 0 on success, -1 on failure. */ int diff --git a/src/or/dircollate.c b/src/or/dircollate.c index 3648664..ed52f0a 100644 --- a/src/or/dircollate.c +++ b/src/or/dircollate.c @@ -225,12 +225,12 @@ dircollator_collate_by_rsa(dircollator_t *dc) * entry in dc by ed25519 key and by RSA key. * * The rule is, approximately: - * If a <ed,rsa> identity is listed by more than half of authorities, - * include it. And include all <rsa>-only votes about that node as + * If a (ed,rsa) identity is listed by more than half of authorities, + * include it. And include all (rsa)-only votes about that node as * matching. * - * Otherwise, if an <*,rsa> or <rsa> identity is listed by more than - * half of the authorities, and no <ed,rsa> pair for the same RSA key + * Otherwise, if an (*,rsa) or (rsa) identity is listed by more than + * half of the authorities, and no (ed,rsa) pair for the same RSA key * has been already been included based on the rule above, include * that RSA identity. */ diff --git a/src/or/main.c b/src/or/main.c index 0bd3527..26e52d2 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -544,7 +544,7 @@ connection_is_reading(connection_t *conn) } /** Check whether conn is correct in having (or not having) a - * read/write event (passed in ev</b). On success, return 0. On failure, + * read/write event (passed in ev). On success, return 0. On failure, * log a warning and return -1. */ static int connection_check_event(connection_t *conn, struct event *ev) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 9c9e091..2990429 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -60,7 +60,8 @@ microdesc_hash_(microdesc_t *md) return (unsigned) siphash24g(md->digest, sizeof(md->digest)); } -/** Helper: compares a and for equality for hash-table purposes. */ +/** Helper: compares a and b for equality for hash-table + * purposes. */ static inline int microdesc_eq_(microdesc_t *a, microdesc_t *b) { diff --git a/src/or/torcert.c b/src/or/torcert.c index de7d28d..a6a33c6 100644 --- a/src/or/torcert.c +++ b/src/or/torcert.c @@ -107,7 +107,7 @@ tor_cert_create(const ed25519_keypair_t *signing_key, now, lifetime, flags); } -/** Release all storage held for cert</>. */ +/** Release all storage held for cert. */ void tor_cert_free(tor_cert_t *cert) {

1 0

[tor/master] Whitespace fixes
by nickm＠torproject.org 26 Mar '16

26 Mar '16

commit c0568a89d93e05d98f4ef57d0b7bb659a357dbef Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 26 09:54:31 2016 -0400 Whitespace fixes --- src/common/sandbox.c | 1 - src/or/dircollate.c | 3 ++- src/or/entrynodes.c | 6 ++++-- src/test/test_util.c | 1 - 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 7365d7a..96429ce 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1891,7 +1891,6 @@ sandbox_cfg_allow_chown_filename(sandbox_cfg_t **cfg, char *file) return 0; } - int sandbox_cfg_allow_chmod_filename(sandbox_cfg_t **cfg, char *file) { diff --git a/src/or/dircollate.c b/src/or/dircollate.c index ed52f0a..3f9d78f 100644 --- a/src/or/dircollate.c +++ b/src/or/dircollate.c @@ -34,7 +34,8 @@ ddmap_entry_free(ddmap_entry_t *e) tor_free(e); } -/** Return a new empty ddmap_entry, with n_votes elements in vrs_list. */ +/** Return a new empty ddmap_entry, with n_votes elements in + * vrs_list. */ static ddmap_entry_t * ddmap_entry_new(int n_votes) { diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 8dbfeae..310a948 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1822,7 +1822,8 @@ get_configured_bridge_by_addr_port_digest(const tor_addr_t *addr, * bridge with no known digest whose address matches addr:port, * return 1. Else return 0. If digest is NULL, check for * address/port matches only. */ -int addr_is_a_configured_bridge(const tor_addr_t *addr, +int +addr_is_a_configured_bridge(const tor_addr_t *addr, uint16_t port, const char *digest) { @@ -1834,7 +1835,8 @@ int addr_is_a_configured_bridge(const tor_addr_t *addr, * ei->identity_digest, or a bridge with no known digest whose address * matches ei->addr:ei->port, return 1. Else return 0. * If ei->onion_key is NULL, check for address/port matches only. */ -int extend_info_is_a_configured_bridge(const extend_info_t *ei) +int +extend_info_is_a_configured_bridge(const extend_info_t *ei) { const char *digest = ei->onion_key ? ei->identity_digest : NULL; return addr_is_a_configured_bridge(&ei->addr, ei->port, digest); diff --git a/src/test/test_util.c b/src/test/test_util.c index 11eb18d..8e5c9bf 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -821,7 +821,6 @@ test_util_parse_http_time(void *arg) T("2038-02-17 06:13:20"); #endif - tt_int_op(-1,OP_EQ, parse_http_time("2004-08-zz 99-99x99 GMT", &a_time)); tt_int_op(-1,OP_EQ, parse_http_time("2011-03-32 00:00:00 GMT", &a_time)); tt_int_op(-1,OP_EQ, parse_http_time("2011-03-30 24:00:00 GMT", &a_time));

1 0

[tor/master] Clarify excess consensus connection cleanup by adding comments
by nickm＠torproject.org 26 Mar '16

26 Mar '16

commit 6057fb2f5bdda80b9056a750261f60ca2c960283 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Sat Mar 26 11:08:39 2016 +1100 Clarify excess consensus connection cleanup by adding comments Comment-only change --- src/or/directory.c | 44 +++++++++++++++++++++++++++++++++++--------- src/or/main.c | 10 ++++++++-- 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 99091b5..9139dbc 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1161,6 +1161,8 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, conn->base_.state = DIR_CONN_STATE_CLIENT_SENDING; /* fall through */ case 0: + /* Close this connection if there's another consensus connection + * downloading (during bootstrap), or connecting (after bootstrap). */ if (connection_dir_close_consensus_conn_if_extra(conn)) { return; } @@ -1211,8 +1213,8 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, connection_mark_for_close(TO_CONN(conn)); return; } - /* XXX the below line is suspicious and uncommented. does it close all - * consensus fetches if we've already bootstrapped? investigate. */ + /* Close this connection if there's another consensus connection + * downloading (during bootstrap), or connecting (after bootstrap). */ if (connection_dir_close_consensus_conn_if_extra(conn)) { return; } @@ -3689,11 +3691,16 @@ connection_dir_avoid_extra_connection_for_purpose(unsigned int purpose) return 0; } -/* Check if we have excess consensus download connection attempts, and close - * conn: +/* Check if we have more than one consensus download connection attempt, and + * close conn: * - if we don't have a consensus, and we're downloading a consensus, and conn - * is not downloading a consensus yet, close it; - * - if we do have a consensus, conn is excess, close it. */ + * is not downloading a consensus yet; + * - if we do have a consensus, and there's more than one consensus connection. + * + * Post-bootstrap consensus connection attempts are initiated one at a time. + * So this function won't close any consensus connection attempts that + * are initiated after bootstrap. + */ int connection_dir_close_consensus_conn_if_extra(dir_connection_t *conn) { @@ -3710,6 +3717,10 @@ connection_dir_close_consensus_conn_if_extra(dir_connection_t *conn) return 0; } + /* Only close this connection if there's another consensus connection + * downloading (during bootstrap), or connecting (after bootstrap). + * Post-bootstrap consensus connection attempts won't be closed, because + * they only occur one at a time. */ if (!connection_dir_would_close_consensus_conn_helper()) { return 0; } @@ -3733,15 +3744,28 @@ connection_dir_close_consensus_conn_if_extra(dir_connection_t *conn) return 0; } -/* Check if we have excess consensus download connection attempts, and close - * them: +/* Clean up excess consensus download connection attempts. + * During bootstrap, or when the bootstrap consensus has just been downloaded, + * if we have more than one active consensus connection: * - if we don't have a consensus, and we're downloading a consensus, keep an * earlier connection, or a connection to a fallback directory, and close * all other connections; - * - if we do have a consensus, close all connections: they are all excess. */ + * - if we have just downloaded the bootstrap consensus, and have other + * consensus connections left over, close all of them. + * + * Post-bootstrap consensus connection attempts are initiated one at a time. + * So this function won't close any consensus connection attempts that + * are initiated after bootstrap. + */ void connection_dir_close_extra_consensus_conns(void) { + /* Only cleanup connections if there is more than one consensus connection, + * and at least one of those connections is already downloading + * (during bootstrap), or connecting (just after the bootstrap consensus is + * downloaded). + * Post-bootstrap consensus connection attempts won't be cleaned up, because + * they only occur one at a time. */ if (!connection_dir_would_close_consensus_conn_helper()) { return; } @@ -3833,6 +3857,8 @@ connection_dir_finished_connecting(dir_connection_t *conn) log_debug(LD_HTTP,"Dir connection to router %s:%u established.", conn->base_.address,conn->base_.port); + /* Close this connection if there's another consensus connection + * downloading (during bootstrap), or connecting (after bootstrap). */ if (connection_dir_close_consensus_conn_if_extra(conn)) { return -1; } diff --git a/src/or/main.c b/src/or/main.c index 00768ac..0bd3527 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1485,8 +1485,14 @@ run_scheduled_events(time_t now) } /* 2d. Cleanup excess consensus bootstrap connections every second. - * connection_dir_close_consensus_conn_if_extra() will close connections - * that are clearly excess, but this check is more thorough. */ + * connection_dir_close_consensus_conn_if_extra() closes some connections + * that are clearly excess, but this check is more thorough. + * This only closes connections if there is more than one consensus + * connection, and at least one of those connections is already downloading + * (during bootstrap), or connecting (just after the bootstrap consensus is + * downloaded). + * It won't close any consensus connections initiated after bootstrap, + * because those attempts are made one at a time. */ connection_dir_close_extra_consensus_conns(); /* 3a. Every second, we examine pending circuits and prune the

1 0

[tor/master] Merge branch 'bug18649_squashed'
by nickm＠torproject.org 26 Mar '16

26 Mar '16

commit c81b1358e706da65b5a513bc8fd851c62e0645b0 Merge: 94cb879 6057fb2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 26 08:17:19 2016 -0400 Merge branch 'bug18649_squashed' src/or/directory.c | 44 +++++++++++++++++++++++++++++++++++--------- src/or/main.c | 10 ++++++++-- 2 files changed, 43 insertions(+), 11 deletions(-)

1 0

[tor-messenger-build/master] Rename trac-18290.mozpatch
by sukhbir＠torproject.org 26 Mar '16

26 Mar '16

commit ccdbb69a0cc79be95d4cf322f12f46af094f07ef Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 26 06:40:18 2016 -0400 Rename trac-18290.mozpatch --- projects/instantbird/trac-18290.mozpatch | 47 ++++++++++++++++++++++++++++++++ projects/instantbird/trac-18290.mozpath | 47 -------------------------------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/projects/instantbird/trac-18290.mozpatch b/projects/instantbird/trac-18290.mozpatch new file mode 100644 index 0000000..1766fb8 --- /dev/null +++ b/projects/instantbird/trac-18290.mozpatch @@ -0,0 +1,47 @@ +From dfb3f02c452b56bd22d7cdf2086b29e118fea688 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Wed, 10 Feb 2016 13:14:03 +0000 +Subject: [PATCH] Disabling view management for mingw-w64 builds + + +diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp +index 85b2879..89be490 100644 +--- a/widget/windows/WindowsUIUtils.cpp ++++ b/widget/windows/WindowsUIUtils.cpp +@@ -20,6 +20,8 @@ + #include "nsString.h" + #include "nsIWidget.h" + ++/* Disable in mingw-w64 Gecko builds. */ ++#if 0 + #include <windows.ui.viewmanagement.h> + + #pragma comment(lib, "runtimeobject.lib") +@@ -85,6 +87,8 @@ public: + }; + #endif + ++#endif ++ + WindowsUIUtils::WindowsUIUtils() : + mInTabletMode(eTabletModeUnknown) + { +@@ -113,6 +117,7 @@ WindowsUIUtils::GetInTabletMode(bool* aResult) + NS_IMETHODIMP + WindowsUIUtils::UpdateTabletModeState() + { ++#if 0 + if (!IsWin10OrLater()) { + return NS_OK; + } +@@ -168,6 +173,7 @@ WindowsUIUtils::UpdateTabletModeState() + } + } + } ++#endif + + return NS_OK; + } +-- +2.7.0 + diff --git a/projects/instantbird/trac-18290.mozpath b/projects/instantbird/trac-18290.mozpath deleted file mode 100644 index 1766fb8..0000000 --- a/projects/instantbird/trac-18290.mozpath +++ /dev/null @@ -1,47 +0,0 @@ -From dfb3f02c452b56bd22d7cdf2086b29e118fea688 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Wed, 10 Feb 2016 13:14:03 +0000 -Subject: [PATCH] Disabling view management for mingw-w64 builds - - -diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp -index 85b2879..89be490 100644 ---- a/widget/windows/WindowsUIUtils.cpp -+++ b/widget/windows/WindowsUIUtils.cpp -@@ -20,6 +20,8 @@ - #include "nsString.h" - #include "nsIWidget.h" - -+/* Disable in mingw-w64 Gecko builds. */ -+#if 0 - #include <windows.ui.viewmanagement.h> - - #pragma comment(lib, "runtimeobject.lib") -@@ -85,6 +87,8 @@ public: - }; - #endif - -+#endif -+ - WindowsUIUtils::WindowsUIUtils() : - mInTabletMode(eTabletModeUnknown) - { -@@ -113,6 +117,7 @@ WindowsUIUtils::GetInTabletMode(bool* aResult) - NS_IMETHODIMP - WindowsUIUtils::UpdateTabletModeState() - { -+#if 0 - if (!IsWin10OrLater()) { - return NS_OK; - } -@@ -168,6 +173,7 @@ WindowsUIUtils::UpdateTabletModeState() - } - } - } -+#endif - - return NS_OK; - } --- -2.7.0 -

1 0

[tor/master] who was that previous arma, who couldn't spell iso?
by arma＠torproject.org 26 Mar '16

26 Mar '16

commit 94cb8792e8c28e75bc71434fc557ddefa5c03083 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Mar 26 02:07:48 2016 -0400 who was that previous arma, who couldn't spell iso? --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 84cfb28..6808a80 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -791,7 +791,7 @@ The following options are useful only for clients (that is, if [[ExcludeNodes]] **ExcludeNodes** __node__,__node__,__...__:: A list of identity fingerprints, country codes, and address patterns of nodes to avoid when building a circuit. Country codes are - 2-letter ISA3166 codes, and must + 2-letter ISO3166 codes, and must be wrapped in braces; fingerprints may be preceded by a dollar sign. (Example: ExcludeNodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) +

1 0