From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Apr 2012 15:14:22 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug5112'
X-Git-Tag: tor-0.2.3.15-alpha~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f5a74002ac6406ebe602a3d8d36d251bd217df4;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug5112'
---

6f5a74002ac6406ebe602a3d8d36d251bd217df4