[tor-commits] [tor/release-0.2.8] Merge remote-tracking branch 'public/bug19203_027' into maint-0.2.8

[nickm at torproject.org]

commit ada5668c5e2c32e7419091221627bff8b4d254fe
Merge: 6eeedc0 bdc59e3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 11 10:16:00 2016 -0400

    Merge remote-tracking branch 'public/bug19203_027' into maint-0.2.8

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