commit f2d994010efe2a8189236babb06b6da26c876a04 Merge: e6f9b2d af6f55b Author: Erinn Clark erinn@torproject.org Date: Wed Apr 25 21:01:25 2012 -0300

Merge branch 'openssl-1.0.1a-fix' into maint-2.2

.../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 ++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-)