From: Roger Dingledine <arma@torproject.org>
Date: Mon, 22 Feb 2010 09:01:04 +0000 (-0500)
Subject: Merge commit 'sebastian/osxinstructions'
X-Git-Tag: tor-0.2.2.9-alpha~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7e0b2d6d9f7aaca005d267af6950abe4dd74d89;p=thirdparty%2Ftor.git

Merge commit 'sebastian/osxinstructions'
---

a7e0b2d6d9f7aaca005d267af6950abe4dd74d89