[tor-commits] [torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3

commit 92f635537c9c95174346d2552b5f81e6a2151199 Merge: f81c8eb 77ba44e Author: Erinn Clark erinn@torproject.org Date: Thu Apr 26 10:04:55 2012 -0300

Merge branch 'maint-2.2' into maint-2.3

build-scripts/linux.mk | 5 ---- build-scripts/osx.mk | 9 +----- build-scripts/versions.mk | 9 ++++++- build-scripts/windows.mk | 7 +---- .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 -------------------- 5 files changed, 11 insertions(+), 45 deletions(-)