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

diff --cc src/or/bridges.c
Simple merge

diff --cc src/or/transports.c
Simple merge

diff --cc src/test/include.am
Simple merge

diff --cc src/test/test.c
Simple merge

diff --cc src/test/test.h
Simple merge