]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 25 Oct 2012 02:55:17 +0000 (22:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 25 Oct 2012 02:55:17 +0000 (22:55 -0400)
commitcda69d0df00b8ee28755731b225123d10a999acc
tree92a8b0641fead6bb3376a91f2658fccd1f12f521
parentf2050e79d5140af3c364221bd736727da3d27cbe
parent1ff2c249bd834a0b2f7de69ed88b61b036bbbf7e
Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
bufferevent_openssl.c
bufferevent_openssl.c
bufferevent_sock.c