[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug12170_024_v2'

[nickm at torproject.org]

commit 723894f114ef091ba09e3ab7440d4339bbc21430
Merge: be90580 ad8977e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 2 00:47:51 2014 -0400

    Merge remote-tracking branch 'public/bug12170_024_v2'

 changes/bug12170  |   11 +++++++++++
 src/or/nodelist.c |    6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)