commit 9d49dd60dd456421221d8a6d8a17940d4b560c7b Merge: eaa69a2 254d63d Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 14 15:45:36 2015 -0500 Merge branch 'maint-0.2.7' into release-0.2.7 src/test/include.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)