Commit cda69d0df00b8ee28755731b225123d10a999acc

Nick Mathewson 2012-10-24T22:55:17

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