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

This commit is contained in:
Nick Mathewson 2013-02-05 15:09:31 -05:00
commit 2901542714

View File

@ -516,7 +516,7 @@ bufferevent_socket_get_dns_error(struct bufferevent *bev)
BEV_LOCK(bev);
rv = bev_p->dns_error;
BEV_LOCK(bev);
BEV_UNLOCK(bev);
return rv;
}