[tor-commits] [tor/master] Merge remote-tracking branch 'teor/master'

[nickm at torproject.org]

commit 569368e5a9a7f418caee513bfd4d4b4dfce9d032
Merge: f273295 5cde98e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 2 09:15:16 2015 -0400

    Merge remote-tracking branch 'teor/master'

 changes/test-network-bridges-hs |    6 ++++++
 src/test/test-network.sh        |   10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)