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

[nickm at torproject.org]

commit 36b4fc7437f22208838616495f699b793ca30771
Merge: 974c2674e ce9b10157
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 25 20:08:39 2019 -0400

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

 src/feature/dirauth/bwauth.c | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)