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

[nickm at torproject.org]

commit 0dc1595d0359dbf51ad24fe8bbadb5ab41fb9eb9
Merge: 2294e330b 1c39d969b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 13:47:01 2018 -0500

    Merge branch 'maint-0.3.2'

 changes/bug24975       |  6 ++++++
 src/or/networkstatus.c | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)