[tor-commits] [tor/master] Merge branch 'bug27224_take2_squashed'

[nickm at torproject.org]

commit b943721b2a3e31ee743fa2daaf70380b9e8f3e0e
Merge: fae7f96e7 1e77376e1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 13 16:43:06 2018 -0400

    Merge branch 'bug27224_take2_squashed'

 changes/bug27224             |   5 ++
 src/feature/client/bridges.c | 106 +++++++++++++++++++++++++++++++++++++++----
 src/test/test_bridges.c      |  93 +++++++++++++++++++++++++++++++++++++
 3 files changed, 195 insertions(+), 9 deletions(-)