commit 2485f8dea4182cf96696ef3e1b170337a41a5e39 Merge: c35416ab8 1c39d969b Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 31 13:47:01 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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