[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

[nickm at torproject.org]

commit 399eebea5480f9515e8a9cd204cd8c5b0dc544db
Merge: dc624a7 6eeedc0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 6 10:17:57 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19191     | 5 +++++
 changes/bug19213     | 3 +++
 src/or/routerlist.c  | 2 +-
 src/test/test_util.c | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)