commit 2bfdfc849bd3e242d07c6cb5fd57434410bee891 Merge: 189f357 a95e18b Author: Nick Mathewson <[email protected]> Date: Thu Mar 12 10:06:10 2015 -0400
Merge remote-tracking branch 'origin/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
