diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-05-27 13:22:16 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-05-27 13:22:16 -0400 |
commit | 1e5ad15688ee3f3660fe35cab23022126b55262d (patch) | |
tree | 2d0441c9faf68dbb9c02f0c1dfab62cd7a584ca9 /src/or/control.c | |
parent | 617b9205515a8ee5f9ddf4fac14eff5178111641 (diff) | |
parent | 3b83da1069f963bc0e9806cdeebc16fb8c2a6129 (diff) | |
download | tor-1e5ad15688ee3f3660fe35cab23022126b55262d.tar.gz tor-1e5ad15688ee3f3660fe35cab23022126b55262d.zip |
Merge remote-tracking branch 'arma/task19035-fixedup'
Diffstat (limited to 'src/or/control.c')
-rw-r--r-- | src/or/control.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/or/control.c b/src/or/control.c index 3ac787e93e..2b69aafb77 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1724,8 +1724,6 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, } else if (!strcmp(question, "limits/max-mem-in-queues")) { tor_asprintf(answer, U64_FORMAT, U64_PRINTF_ARG(get_options()->MaxMemInQueues)); - } else if (!strcmp(question, "dir-usage")) { - *answer = directory_dump_request_log(); } else if (!strcmp(question, "fingerprint")) { crypto_pk_t *server_key; if (!server_mode(get_options())) { @@ -2561,7 +2559,6 @@ static const getinfo_item_t getinfo_items[] = { "Username under which the tor process is running."), ITEM("process/descriptor-limit", misc, "File descriptor limit."), ITEM("limits/max-mem-in-queues", misc, "Actual limit on memory in queues"), - ITEM("dir-usage", misc, "Breakdown of bytes transferred over DirPort."), PREFIX("desc-annotations/id/", dir, "Router annotations by hexdigest."), PREFIX("dir/server/", dir,"Router descriptors as retrieved from a DirPort."), PREFIX("dir/status/", dir, |