commit ff3e90070fd21788ac2c1c9116f18c9b888c750a Merge: b9596b8 d0c209c Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 22 20:38:33 2015 -0500 Merge branch 'maint-0.2.7' changes/bug17923 | 4 ++++ configure.ac | 1 - 2 files changed, 4 insertions(+), 1 deletion(-)