commit ad0ae89b3c872ee89f4bd6096e650d4e2c855330 Merge: 2ecaa59 a3c49ca Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 9 10:22:42 2014 -0400

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

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