commit 97c3fac6d4761ce441d6e1926d39e71700da2261 Merge: 420e8737b ab415ae95 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 13 11:18:02 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug23470 | 6 ++++++ src/or/directory.c | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-)