commit 5d68e5b8fcf5c807cbf0d3d65a3bb6b181faea0d Merge: 592cc50 c11de4c Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 19 08:01:27 2016 -0500 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug21018 | 11 +++++++++++ src/or/rendcache.c | 4 +++- src/or/routerparse.c | 6 +++--- 3 files changed, 17 insertions(+), 4 deletions(-)