[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

[nickm at torproject.org]

commit ec3df7cbd2d122d66bab7c389715ff9579eb0899
Merge: ce12cde 0fb3058
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 18:05:47 2016 -0500

    Merge branch 'maint-0.2.4' into release-0.2.4

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