From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 20 Feb 2012 18:00:17 +0000 (-0500)
Subject: Merge remote-tracking branch 'sebastian/bug5161'
X-Git-Tag: tor-0.2.3.13-alpha~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81fe3e438b39cd14986247581d03cb0d0d650f1d;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'sebastian/bug5161'
---

81fe3e438b39cd14986247581d03cb0d0d650f1d