[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug19203_027' into HEAD

[nickm at torproject.org]

commit b14c1f40826d9e2383707036b6e524f6756aa5d5
Merge: 4f8086f bdc59e3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 11 10:11:44 2016 -0400

    Merge remote-tracking branch 'public/bug19203_027' into HEAD

 changes/bug19203  | 4 ++++
 src/or/nodelist.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)