commit c0c0a6085e7e6395e4f5819ba47076786ae2f2b0 Merge: 2f67a6e 6785f0b Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 8 10:33:38 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.6'

changes/ticket8243 | 7 +++++++ src/or/dirserv.c | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-)