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

[nickm at torproject.org]

commit 8a951ed15816b028baf30a0606b9a15a39a36601
Merge: 9b87a6c 9139aea
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 23 09:04:53 2015 -0400

    Merge remote-tracking branch 'teor/bug-15771-reachability'

 changes/bug-15771-reachability |    8 ++++++++
 src/or/circuitbuild.c          |    9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)