commit e899d49e2fa726a4f65120c9457b8d13d51f3944 Author: Roger Dingledine arma@torproject.org Date: Mon Dec 3 13:33:43 2012 -0500

fix some typos --- src/or/connection_edge.c | 2 +- src/or/microdesc.c | 12 ++++++------ src/or/nodelist.c | 4 ++-- src/or/policies.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 41c75a2..0220930 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -790,7 +790,7 @@ circuit_discard_optional_exit_enclaves(extend_info_t *info) /** The AP connection <b>conn</b> has just failed while attaching or * sending a BEGIN or resolving on <b>circ</b>, but another circuit * might work. Detach the circuit, and either reattach it, launch a - * new circuit, tell the controller, or give up as a appropriate. + * new circuit, tell the controller, or give up as appropriate. * * Returns -1 on err, 1 on success, 0 on not-yet-sure. */ diff --git a/src/or/microdesc.c b/src/or/microdesc.c index e274313..7602a93 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -75,7 +75,7 @@ dump_microdescriptor(FILE *f, microdesc_t *md, size_t *annotation_len_out) { ssize_t r = 0; size_t written; - /* XXXX drops unkown annotations. */ + /* XXXX drops unknown annotations. */ if (md->last_listed) { char buf[ISO_TIME_LEN+1]; char annotation[ISO_TIME_LEN+32]; @@ -132,7 +132,7 @@ get_microdesc_cache(void) */

/** Decode the microdescriptors from the string starting at <b>s</b> and - * ending at <b>eos</b>, and store them in <b>cache</b>. If <b>no-save</b>, + * ending at <b>eos</b>, and store them in <b>cache</b>. If <b>no_save</b>, * mark them as non-writable to disk. If <b>where</b> is SAVED_IN_CACHE, * leave their bodies as pointers to the mmap'd cache. If where is * <b>SAVED_NOWHERE</b>, do not allow annotations. If listed_at is positive, @@ -160,7 +160,7 @@ microdescs_add_to_cache(microdesc_cache_t *cache, md->last_listed = listed_at); } if (requested_digests256) { - digestmap_t *requested; /* XXXX actuqlly we should just use a + digestmap_t *requested; /* XXXX actually we should just use a digest256map */ requested = digestmap_new(); SMARTLIST_FOREACH(requested_digests256, const char *, cp, @@ -169,7 +169,7 @@ microdescs_add_to_cache(microdesc_cache_t *cache, if (digestmap_get(requested, md->digest)) { digestmap_set(requested, md->digest, (void*)2); } else { - log_fn(LOG_PROTOCOL_WARN, LD_DIR, "Received non-requested microcdesc"); + log_fn(LOG_PROTOCOL_WARN, LD_DIR, "Received non-requested microdesc"); microdesc_free(md); SMARTLIST_DEL_CURRENT(descriptors, md); } @@ -188,7 +188,7 @@ microdescs_add_to_cache(microdesc_cache_t *cache, return added; }

-/** As microdescs_add_to_cache, but takes a list of micrdescriptors instead of +/** As microdescs_add_to_cache, but takes a list of microdescriptors instead of * a string to decode. Frees any members of <b>descriptors</b> that it does * not add. */ smartlist_t * @@ -232,7 +232,7 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, size_t annotation_len; size = dump_microdescriptor(f, md, &annotation_len); if (size < 0) { - /* we already warned in dump_microdescriptor; */ + /* we already warned in dump_microdescriptor */ abort_writing_to_file(open_file); smartlist_clear(added); return added; diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 7bb5e4f..95345fb 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -624,7 +624,7 @@ node_is_dir(const node_t *node) }

/** Return true iff <b>node</b> has either kind of usable descriptor -- that - * is, a routerdecriptor or a microdescriptor. */ + * is, a routerdescriptor or a microdescriptor. */ int node_has_descriptor(const node_t *node) { @@ -1139,7 +1139,7 @@ node_is_unreliable(const node_t *node, int need_uptime, }

/** Return 1 if all running sufficiently-stable routers we can use will reject - * addr:port, return 0 if any might accept it. */ + * addr:port. Return 0 if any might accept it. */ int router_exit_policy_all_nodes_reject(const tor_addr_t *addr, uint16_t port, int need_uptime) diff --git a/src/or/policies.c b/src/or/policies.c index dd7de70..27cdd84 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1616,7 +1616,7 @@ short_policy_is_reject_star(const short_policy_t *policy) policy->entries[0].max_port == 65535); }

-/** Decides whether addr:port is probably or definitely accepted or rejected by +/** Decide whether addr:port is probably or definitely accepted or rejected by * <b>node</b>. See compare_tor_addr_to_addr_policy for details on addr/port * interpretation. */ addr_policy_result_t