commit 9e57ffa520bb0e8b9a7dd32e005e6b29a3f8bdfa Merge: 93c311d e247093 Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 1 08:15:05 2016 -0400

Merge branch 'maint-0.2.8'

changes/bug18460 | 4 ++++ src/or/directory.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-)