commit a8043f0b9c767675e906f324fc3b9c34fbbedc33 Merge: 0fdea13 b9f4cc4 Author: Erinn Clark <erinn@torproject.org> Date: Tue Jun 12 15:34:53 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)