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

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

3da9a14f1c8b02215db1a14e31b6d5de4074998b