commit 6648eafc126d163173dc8b7b204046611f085d36 Merge: b8574c2 f2d9940 Author: Erinn Clark <erinn@torproject.org> Date: Wed Apr 25 21:01:34 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 ++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-)