commit 81433e74322bb6cab67458ff7ba524ee86ad7e1c Merge: ccc54d5 032560f Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 12 13:12:14 2014 -0500

Merge remote-tracking branch 'rl1987/bug13644'

changes/bug13644 | 4 ++++ src/or/dirserv.c | 6 +++--- src/or/or.h | 18 +++++++++++++++++- src/or/routerlist.c | 4 ++-- src/or/routerlist.h | 2 +- 5 files changed, 27 insertions(+), 7 deletions(-)