commit 2da2718609841bb7028ae2c802e26d80c857fe90 Merge: 27c1b0e 01e7f42 Author: Nick Mathewson nickm@torproject.org Date: Wed May 4 15:23:38 2016 -0400

Merge branch 'maint-0.2.8'

changes/bug18921 | 4 ++++ src/or/directory.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-)