[tor-commits] [tor/master] Merge branch 'bug8367_v2'

[nickm at torproject.org]

commit dc4ccfdbe22a48cea888179c8a1c6c671885b022
Merge: c72d58c 8b26766
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 1 09:33:15 2013 -0500

    Merge branch 'bug8367_v2'

 src/or/entrynodes.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)