commit 2f0e187191216d6dc4a3527e7e3b2bf268d869c0
parent 578a93bbbc9ecb6fa67aead760bfeb40e7977d39
Author: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Jan 2019 15:46:14 -0500
Merge remote-tracking branch 'tor-github/pr/627'
Diffstat:
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/changes/ticket28757 b/changes/ticket28757
@@ -0,0 +1,5 @@
+ o Removed features:
+ - Stop responding to 'GETINFO status/version/num-concurring' and
+ 'GETINFO status/version/num-versioning' control port commands, as those
+ were deprecated back in 0.2.0.30. Also stop listing them in output of
+ 'GETINFO info/names'. Resolves ticket 28757.
diff --git a/src/feature/control/control.c b/src/feature/control/control.c
@@ -3089,11 +3089,6 @@ getinfo_helper_events(control_connection_t *control_conn,
case VS_UNKNOWN: *answer = tor_strdup("unknown"); break;
default: tor_fragile_assert();
}
- } else if (!strcmp(question, "status/version/num-versioning") ||
- !strcmp(question, "status/version/num-concurring")) {
- tor_asprintf(answer, "%d", get_n_authorities(V3_DIRINFO));
- log_warn(LD_GENERAL, "%s is deprecated; it no longer gives useful "
- "information", question);
}
} else if (!strcmp(question, "status/clients-seen")) {
char *bridge_stats = geoip_get_bridge_stats_controller(time(NULL));
@@ -3386,10 +3381,6 @@ static const getinfo_item_t getinfo_items[] = {
"A fresh relay/ei descriptor pair for Tor's current state. Not stored."),
DOC("status/version/recommended", "List of currently recommended versions."),
DOC("status/version/current", "Status of the current version."),
- DOC("status/version/num-versioning", "Number of versioning authorities."),
- DOC("status/version/num-concurring",
- "Number of versioning authorities agreeing on the status of the "
- "current version"),
ITEM("address", misc, "IP address of this Tor host, if we can guess it."),
ITEM("traffic/read", misc,"Bytes read since the process was started."),
ITEM("traffic/written", misc,
