[tor-commits] [tor/release-0.3.0] Merge remote-tracking branch 'public/bug21415_testfix_030' into maint-0.3.0

[nickm at torproject.org]

commit 5d8061cd019a751530a25fa99a7300b84df1722f
Merge: ef4c10f 6cab0f8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 3 09:27:40 2017 -0400

    Merge remote-tracking branch 'public/bug21415_testfix_030' into maint-0.3.0

 src/or/bridges.c    | 4 ++--
 src/or/entrynodes.c | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)