From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 16 Jan 2013 18:56:10 +0000 (-0500)
Subject: Merge branch 'bug7972'
X-Git-Tag: tor-0.2.4.10-alpha~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65e6e68981d9910c5f78f2cfed6c59cbee1494c7;p=thirdparty%2Ftor.git

Merge branch 'bug7972'
---

65e6e68981d9910c5f78f2cfed6c59cbee1494c7