diff options
| author | Robert Ransom <rransom.8774@gmail.com> | 2011-06-25 15:04:07 -0700 |
|---|---|---|
| committer | Robert Ransom <rransom.8774@gmail.com> | 2011-06-25 15:04:07 -0700 |
| commit | c780bc4d0b30e05ce2212756d93315f5680035a7 (patch) | |
| tree | 4508b0a5e24c285f4d6b99426caaf499a9dcddfb /src/or/control.c | |
| parent | 0b536469ee8a6d437cd939cbcdaa56039e27cdcb (diff) | |
| parent | 93d52f6739d3bb184575aa53eab1562d2c80ee57 (diff) | |
| download | tor-c780bc4d0b30e05ce2212756d93315f5680035a7.tar.gz tor-c780bc4d0b30e05ce2212756d93315f5680035a7.zip | |
Merge branch 'bug3465-022' into bug3465-023
* bug3465-022:
Add BUILDTIMEOUT_SET to the result of GETINFO events/names
Correct a comment
Fix minor comment issues
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c index e65cd260e2..33be5a0597 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1389,7 +1389,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")) { |