From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 3 Aug 2010 14:48:30 +0000 (-0400)
Subject: Merge commit 'erinn/rpm-devel'
X-Git-Tag: tor-0.2.2.15-alpha~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3556d2708562bed27a0d3872466e5c832d42f2d8;p=thirdparty%2Ftor.git

Merge commit 'erinn/rpm-devel'
---

3556d2708562bed27a0d3872466e5c832d42f2d8