commit 118d7018d07ebc6324e8b7220002465479b0cbf3 Merge: 85782e1 6cab0f8 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Mar 9 09:25:19 2017 -0500 Merge branch 'bug21415_testfix_030' src/or/bridges.c | 4 ++-- src/or/entrynodes.c | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-)