commit 9a13d32c69de5b9a2152614ac035689b2d663ef1 Merge: 4321ed0 fe08391 Author: Erinn Clark <erinn@torproject.org> Date: Fri Sep 9 17:49:36 2011 +0100 Merge branch 'bug2312-v4' into maint-2.2 build-scripts/linux.mk | 15 ++- build-scripts/remove-shared-lib-symlinks | 226 ++++++++++++++++++++++++++++++ 2 files changed, 240 insertions(+), 1 deletions(-)