Merge commit 'sebastian/osxinstructions'
commita7e0b2d6d9f7aaca005d267af6950abe4dd74d89
authorRoger Dingledine <arma@torproject.org>
Mon, 22 Feb 2010 09:01:04 +0000 (22 04:01 -0500)
committerRoger Dingledine <arma@torproject.org>
Mon, 22 Feb 2010 09:01:04 +0000 (22 04:01 -0500)
tree260f3f27377f24ccb25b8b1a9c622cf921afa242
parent5aa9610dd6bc85574c9861d533daec16b74088a0
parenteeba8581b26deb77f8eda0862fc4900f85ccd8e8
Merge commit 'sebastian/osxinstructions'