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

[nickm at torproject.org]

commit 5ed8ac4e57a01f6f29221a795160de302e2f5eee
Merge: f57722d 50028e4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 16 11:41:37 2013 -0500

    Merge remote-tracking branch 'asn/bug7896'

 src/or/entrynodes.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)