commit e247093e0efba100ec6f3abdfa9d3433d51389f0 Merge: ba87f5b b79d859 Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 1 08:10:58 2016 -0400

Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8

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