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

This commit is contained in:
Nick Mathewson 2013-03-25 21:14:10 -04:00
commit 1bc4a8f99d

View File

@ -939,7 +939,7 @@ void evbuffer_cb_unsuspend(struct evbuffer *buffer, struct evbuffer_cb_entry *cb
#endif
/**
Makes the data at the begging of an evbuffer contiguous.
Makes the data at the beginning of an evbuffer contiguous.
@param buf the evbuffer to make contiguous
@param size the number of bytes to make contiguous, or -1 to make the