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

[nickm at torproject.org]

commit 52194c86811a518f94291492fe6ddd03ef632c3b
Merge: 5fb5019a9 8c4c58cc8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 7 10:13:32 2019 -0400

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

 changes/bug31922 |  4 ++++
 configure.ac     | 21 ++++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)