Commit b98624ef3503cea3dc3bb3312d10e22127fabb8b

Nick Mathewson 2012-04-30T21:33:56

Merge remote-tracking branch 'origin/patches-2.0' Conflicts: bufferevent_openssl.c