commit 4b3e6c4d43b169c04b7fa34c1f2bb618b97151bf Merge: 9e57ffa fdb57db Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 1 08:18:03 2016 -0400

Merge branch 'maint-0.2.8'

changes/bug18133 | 4 ++++ src/or/routerkeys.c | 4 ++++ 2 files changed, 8 insertions(+)