commit e31980f693b569541aded815a504eb62a76649d9 Merge: 84af12e 50249c7 Author: Nick Mathewson <nickm@torproject.org> Date: Wed May 11 12:23:40 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18841.1 | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)