From: Roger Dingledine <arma@torproject.org>
Date: Thu, 17 Sep 2009 00:29:37 +0000 (-0400)
Subject: Merge commit 'sebastian/manpage'
X-Git-Tag: tor-0.2.2.2-alpha~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61eb3711eee2be8e37ace89c8020ce4ae8502b93;p=thirdparty%2Ftor.git

Merge commit 'sebastian/manpage'
---

61eb3711eee2be8e37ace89c8020ce4ae8502b93