diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-30 07:36:55 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-30 07:36:55 -0500 |
| commit | fac8d40886a03d442ed9f8c18df5ed017b1e6dd0 (patch) | |
| tree | ebaa6185038792b896ce0f7fc147ef1a67f08599 /src/or/control.c | |
| parent | d1e52d9a2a26c1bf9f80b237e692c72517c30495 (diff) | |
| parent | b4a8fd895802801198229574c55b3df975aa2244 (diff) | |
| download | tor-fac8d40886a03d442ed9f8c18df5ed017b1e6dd0.tar.gz tor-fac8d40886a03d442ed9f8c18df5ed017b1e6dd0.zip | |
Merge remote-tracking branch 'public/prop227_v2'
Conflicts:
src/test/test_dir.c
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c index e963aeab7f..24e1479b50 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2183,6 +2183,8 @@ static const getinfo_item_t getinfo_items[] = { "Brief summary of router status by nickname (v2 directory format)."), PREFIX("ns/purpose/", networkstatus, "Brief summary of router status by purpose (v2 directory format)."), + PREFIX("consensus/", networkstatus, + "Information about and from the ns consensus."), ITEM("network-status", dir, "Brief summary of router status (v1 directory format)"), ITEM("circuit-status", events, "List of current circuits originating here."), |