commit a95e18b3589a2ebc4b9a5c741c37bdf083d5057d Merge: 985687b 192ed94 Author: Nick Mathewson <[email protected]> Date: Thu Mar 12 10:05:06 2015 -0400
Merge branch 'bug9495_redux_v2' into maint-0.2.6
changes/bug9495_redux | 4 ++++
src/common/compat_pthreads.c | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
