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

[nickm at torproject.org]

commit f2824887e326e9fdc5f096f99d4dfe4aeee4d79a
Merge: 945aa99 33841a6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 19 16:05:04 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

 src/or/networkstatus.c     |  6 +++++-
 src/test/test_connection.c | 20 +++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)