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

[nickm at torproject.org]

commit 53ba3443e109b42e17872a7213c7cb6ffe6566b3
Merge: b13303b a9c8a5f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 18:14:29 2016 -0500

    Merge branch 'maint-0.2.7' into release-0.2.7

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