Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Sat, 23 Apr 2011 03:46:25 +0000 (23:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Sat, 23 Apr 2011 03:46:25 +0000 (23:46 -0400)
commit614a1712b77b6cb5b9e56cbc8a53077b6f66b8cc
treeaa1841db5453a5f2680a3d1fc72f323731bdf32b
parent34631be00c3d2d0e831708cc0e1f08dc92583961
parent646f9feb261d7e45b75dc2fcf65b9e719dd5f829
Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
evthread.c
bufferevent_filter.c
bufferevent_openssl.c
bufferevent_sock.c
configure.in
evdns.c
evthread.c
http.c
test/regress_buffer.c