From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 23 Apr 2011 03:46:25 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~292
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=614a1712b77b6cb5b9e56cbc8a53077b6f66b8cc;p=libevent

Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
	evthread.c
---

614a1712b77b6cb5b9e56cbc8a53077b6f66b8cc
diff --cc evthread.c
index a8b2534f,2cfb76e9..37621dd8
--- a/evthread.c
+++ b/evthread.c
@@@ -228,7 -217,7 +228,8 @@@ debug_cond_wait(void *_cond, void *_loc
  {
  	int r;
  	struct debug_lock *lock = _lock;
+ 	EVUTIL_ASSERT(lock);
 +	EVUTIL_ASSERT(DEBUG_LOCK_SIG == lock->signature);
  	EVLOCK_ASSERT_LOCKED(_lock);
  	evthread_debug_lock_mark_unlocked(0, lock);
  	r = _original_cond_fns.wait_condition(_cond, lock->lock, tv);