[tor-commits] [tor/master] Merge remote-tracking branch 'ffmancera/github/bug24573'

[nickm at torproject.org]

commit 7a606004111d8d12d4d90b26697bc9bab02b0227
Merge: c8c258a43 525c1c493
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 11 08:31:25 2018 -0500

    Merge remote-tracking branch 'ffmancera/github/bug24573'

 changes/ticket24573 |  7 +++++++
 src/or/bridges.c    | 59 +++++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 57 insertions(+), 9 deletions(-)