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

[nickm at torproject.org]

commit 916fba2243f36dcf53b078a95ce2389a63b94f72
Merge: 01a0ab0 2994f00
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 20 15:32:48 2014 -0400

    Merge branch 'bug12205_take2_squashed'

 changes/bug12205           |    4 +++
 src/or/entrynodes.c        |   41 +++++++++++++++++-------
 src/or/entrynodes.h        |    3 ++
 src/test/test_entrynodes.c |   76 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 113 insertions(+), 11 deletions(-)