From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 27 Jan 2012 16:49:34 +0000 (-0500)
Subject: Merge remote-tracking branch 'sebastian/osx_deadstrip'
X-Git-Tag: tor-0.2.3.12-alpha~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b29c8f48f5c4b9b172e5975adba61a72a275a7a;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'sebastian/osx_deadstrip'
---

2b29c8f48f5c4b9b172e5975adba61a72a275a7a