[tor-commits] [tor/maint-0.2.8] Merge remote-tracking branch 'teor/fix18809-warnings' into maint-0.2.8

[nickm at torproject.org]

commit 33841a60303ce8febf8180829a868dcc43924d77
Merge: 0d6f293 2d21f03
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 19 16:04:56 2016 -0400

    Merge remote-tracking branch 'teor/fix18809-warnings' into maint-0.2.8

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