commit 31a08ba26fc5eaa12de6d3c5efa3aac4d00509d0 Merge: 0ac8f0b 5537e1f Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 29 11:34:06 2017 -0400

Merge remote-tracking branch 'public/bug22670_031' into 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(-)