From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 4 Sep 2012 14:14:55 +0000 (-0400)
Subject: Merge remote-tracking branch 'arma/feature6760'
X-Git-Tag: tor-0.2.4.1-alpha~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=978a2251f33416a95d5c2d8c8a844d1777d20429;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'arma/feature6760'
---

978a2251f33416a95d5c2d8c8a844d1777d20429