aboutsummaryrefslogtreecommitdiff
path: root/src/or/networkstatus.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-04 11:43:11 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-04 11:43:11 -0500
commitf50d64b62eeb7c07f2e0dd7f23499880d208a434 (patch)
tree570acef7b146b40d140a5d7420c274b1286d7a49 /src/or/networkstatus.c
parentcf3da63b9023875e93c05d30fb6d76e047bebe70 (diff)
parenta2c09f67512e79ed2c714e698c0234b7c8fad8a9 (diff)
downloadtor-f50d64b62eeb7c07f2e0dd7f23499880d208a434.tar.gz
tor-f50d64b62eeb7c07f2e0dd7f23499880d208a434.zip
Merge branch 'bug23826-23828_squashed'
Diffstat (limited to 'src/or/networkstatus.c')
-rw-r--r--src/or/networkstatus.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 10d9b7542a..caf771193c 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -2209,7 +2209,9 @@ signed_descs_update_status_from_consensus_networkstatus(smartlist_t *descs)
char *
networkstatus_getinfo_helper_single(const routerstatus_t *rs)
{
- return routerstatus_format_entry(rs, NULL, NULL, NS_CONTROL_PORT, NULL);
+ return routerstatus_format_entry(rs, NULL, NULL, NS_CONTROL_PORT,
+ ROUTERSTATUS_FORMAT_NO_CONSENSUS_METHOD,
+ NULL);
}
/** Alloc and return a string describing routerstatuses for the most