From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 Aug 2010 13:42:05 +0000 (-0400)
Subject: Merge branch 'build-wo-asciidoc-on-bsd'
X-Git-Tag: tor-0.2.2.15-alpha~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1cf19b5046ed8024355851f478dc3ffa6f79740e;p=thirdparty%2Ftor.git

Merge branch 'build-wo-asciidoc-on-bsd'
---

1cf19b5046ed8024355851f478dc3ffa6f79740e