From cb1b20dbad2ee346a814b30d5dc72a3dc93069e5 Mon Sep 17 00:00:00 2001 From: Robert Ransom Date: Thu, 23 Jun 2011 15:10:11 -0700 Subject: Fix minor comment issues --- src/or/circuitbuild.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/or') diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6d7e71194..1140f3314 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1501,7 +1501,7 @@ get_unique_circ_id_by_conn(or_connection_t *conn) } /** If verbose is false, allocate and return a comma-separated list of - * the currently built elements of circuit_t. If verbose is true, also + * the currently built elements of circ. If verbose is true, also * list information about link status in a more verbose format using spaces. * If verbose_names is false, give nicknames for Named routers and hex * digests for others; if verbose_names is true, use $DIGEST=Name style @@ -1590,7 +1590,7 @@ circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names) } /** If verbose is false, allocate and return a comma-separated - * list of the currently built elements of circuit_t. If + * list of the currently built elements of circ. If * verbose is true, also list information about link status in * a more verbose format using spaces. */ @@ -1601,7 +1601,7 @@ circuit_list_path(origin_circuit_t *circ, int verbose) } /** Allocate and return a comma-separated list of the currently built elements - * of circuit_t, giving each as a verbose nickname. + * of circ, giving each as a verbose nickname. */ char * circuit_list_path_for_controller(origin_circuit_t *circ) @@ -1610,7 +1610,7 @@ circuit_list_path_for_controller(origin_circuit_t *circ) } /** Log, at severity severity, the nicknames of each router in - * circ's cpath. Also log the length of the cpath, and the intended + * circ's cpath. Also log the length of the cpath, and the intended * exit point. */ void @@ -1622,7 +1622,7 @@ circuit_log_path(int severity, unsigned int domain, origin_circuit_t *circ) } /** Tell the rep(utation)hist(ory) module about the status of the links - * in circ. Hops that have become OPEN are marked as successfully + * in circ. Hops that have become OPEN are marked as successfully * extended; the _first_ hop that isn't open (if any) is marked as * unable to extend. */ -- cgit v1.2.3 From 53f87a89f00d075bdc81c2c468e844f3132ef953 Mon Sep 17 00:00:00 2001 From: Robert Ransom Date: Fri, 24 Jun 2011 15:12:45 -0700 Subject: Correct a comment --- src/or/circuitlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/or') diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 8534c3807..e9cc9eb1f 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -866,7 +866,7 @@ circuit_unlink_all_from_or_conn(or_connection_t *conn, int reason) } /** Return a circ such that: - * - circ-\>rend_data-\>query is equal to rend_query, and + * - circ-\>rend_data-\>onion_address is equal to rend_query, and * - circ-\>purpose is equal to purpose. * * Return NULL if no such circuit exists. -- cgit v1.2.3 From 93d52f6739d3bb184575aa53eab1562d2c80ee57 Mon Sep 17 00:00:00 2001 From: Robert Ransom Date: Sat, 25 Jun 2011 15:02:11 -0700 Subject: Add BUILDTIMEOUT_SET to the result of GETINFO events/names --- changes/bug3465-022 | 6 ++++++ src/or/control.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changes/bug3465-022 (limited to 'src/or') diff --git a/changes/bug3465-022 b/changes/bug3465-022 new file mode 100644 index 000000000..2d226162a --- /dev/null +++ b/changes/bug3465-022 @@ -0,0 +1,6 @@ + o Minor bugfixes: + + - Add BUILDTIMEOUT_SET to the list returned by the 'GETINFO + events/names' control-port command. Bugfix on 0.2.2.9-alpha; + fixes part of bug 3465. + diff --git a/src/or/control.c b/src/or/control.c index 82017bd1d..da0a95da1 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1380,7 +1380,8 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, *answer = tor_strdup("CIRC STREAM ORCONN BW DEBUG INFO NOTICE WARN ERR " "NEWDESC ADDRMAP AUTHDIR_NEWDESCS DESCCHANGED " "NS STATUS_GENERAL STATUS_CLIENT STATUS_SERVER " - "GUARD STREAM_BW CLIENTS_SEEN NEWCONSENSUS"); + "GUARD STREAM_BW CLIENTS_SEEN NEWCONSENSUS " + "BUILDTIMEOUT_SET"); } else if (!strcmp(question, "features/names")) { *answer = tor_strdup("VERBOSE_NAMES EXTENDED_EVENTS"); } else if (!strcmp(question, "address")) { -- cgit v1.2.3