[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm at torproject.org]

commit de656474611c43f24dd5fff430de945b34b738bf
Merge: 169a93f c11de4c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 19 07:58:43 2016 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9

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