[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6

commit 7eb84e10e32f787ebddca6692431bf9c70a96073 Merge: 0f0b838 1a1d431 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 12 12:11:03 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

changes/bug15245 | 5 +++++ changes/bug9495_redux | 4 ++++ src/common/compat_pthreads.c | 6 +++++- src/common/container.h | 1 - src/or/cpuworker.c | 8 ++++++++ src/test/test_status.c | 6 ++++-- 6 files changed, 26 insertions(+), 4 deletions(-)