commit 62aad9c0b6812d04cfca3ec9e104d8ee2cbebb7c Merge: fe8eb9b 232ccc1 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Nov 25 09:28:44 2015 -0500 Merge branch 'maint-0.2.7' changes/bug17551 | 4 ++++ configure.ac | 3 +++ 2 files changed, 7 insertions(+)