[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/64'

[nickm at torproject.org]

commit e8497bfaa70ef7ce8c48bc2c5464d6fddb8fcff1
Merge: 7d0e64016e ff68aeb492
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 21 09:33:41 2020 -0400

    Merge remote-tracking branch 'tor-gitlab/mr/64'

 changes/ticket33220      |  5 +++++
 src/core/or/extendinfo.c | 33 +++++++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 4 deletions(-)