[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm at torproject.org]

commit dcc4fd440392eec3dd8796c9c759faed51a61db0
Merge: 649785d 33841a6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 19 16:05:13 2016 -0400

    Merge branch 'maint-0.2.8'

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