From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Sep 2012 19:31:04 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/ticket6789'
X-Git-Tag: tor-0.2.4.2-alpha~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4319f998283d33af61b1855b7fa287fa93113dbd;p=thirdparty%2Ftor.git

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

4319f998283d33af61b1855b7fa287fa93113dbd