commit 3781678a3c38fbbf95abea9c055d08ca20b870f6 Merge: 2c718c1 31a08ba Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 29 11:38:06 2017 -0400

Merge branch 'maint-0.3.1'

changes/bug22670 | 4 + changes/bug22670_02 | 4 + changes/bug22670_03 | 6 ++ src/or/directory.c | 205 +++++++++++++++++++++++++++++++--------------------- 4 files changed, 135 insertions(+), 84 deletions(-)