commit d1a0f2e7e43553d25e5b9d9ba71ee058897b0ce1 Merge: a9fb2b4 38e3f91 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 8 07:12:16 2016 -0500

Merge branch 'maint-0.2.9'

changes/bug20597 | 5 +++++ src/or/directory.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-)