commit 39b2f2d35e1c6638332846ed9df75f77ea114df5 Merge: f3ed5ec ff843ed Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 14 13:21:16 2015 -0500 Merge branch 'maint-0.2.7' Makefile.am | 7 +++++++ changes/bug17818 | 3 +++ src/or/include.am | 3 --- src/test/include.am | 11 ++++++----- 4 files changed, 16 insertions(+), 8 deletions(-)