commit 2b29c8f48f5c4b9b172e5975adba61a72a275a7a Merge: 247a213 1f5c562 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 27 11:49:34 2012 -0500

Merge remote-tracking branch 'sebastian/osx_deadstrip'

changes/osx_deadstrip | 5 +++++ configure.in | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-)