commit 38daa8f3cc7d8a62a852673dd062842a137fb86e Merge: f6614c7 10baf2c Author: Nick Mathewson <nickm@torproject.org> Date: Wed Dec 7 18:26:43 2016 -0500 Merge branch 'maint-0.2.8' into release-0.2.8 src/common/compat_pthreads.c | 5 +++++ 1 file changed, 5 insertions(+)