[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1270'

[nickm at torproject.org]

commit 46a38206525632671a606319962decc2874467dc
Merge: f5fa283a0 063cf9cd2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 4 09:52:35 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1270'

 changes/ticket31545             |   5 ++
 src/feature/nodelist/describe.c | 101 +++++++++++++++++++++++++++++++---------
 src/lib/string/compat_string.h  |   3 ++
 3 files changed, 87 insertions(+), 22 deletions(-)