commit 3317cd3a1f4e3a7883bf9a5eba3f9a13097fe437 Merge: a5da27c 33b5bfb Author: Nick Mathewson <nickm at torproject.org> Date: Wed Dec 16 09:24:40 2015 -0500 Merge branch 'maint-0.2.7' changes/bug17819 | 4 ++++ configure.ac | 1 + src/common/compat_pthreads.c | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-)