[tor-commits] [tor/master] Merge remote-tracking branch 'isis-github/bug25425_squashed2'

commit 6bdfaa8b244ca3e10e57f6d99616af1d5f68fa67 Merge: 6e467a7a3 4178642bf Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 10 15:32:26 2018 -0400

Merge remote-tracking branch 'isis-github/bug25425_squashed2'

changes/bug25425 | 4 + src/or/bridges.c | 10 +- src/or/bridges.h | 13 +- src/or/transports.c | 6 +- src/or/transports.h | 5 +- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 9 + src/test/test_bridges.c | 618 ++++++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 658 insertions(+), 9 deletions(-)