commit 056978c31c8b2c42e2a7352cbf4b9da31185ca65 Merge: 5322713 db58d4d Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 20 18:11:16 2016 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

changes/bug21018 | 11 +++++++++++ src/or/rendcommon.c | 6 ++++-- src/or/routerparse.c | 6 +++--- 3 files changed, 18 insertions(+), 5 deletions(-)