From: Andrea Shepard <andrea@torproject.org>
Date: Sat, 11 May 2013 04:05:34 +0000 (-0700)
Subject: Merge branch 'maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~195
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50beb81d53e0697b3dc4d7dd04ebf6277f1bfaf1;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.4'
---

50beb81d53e0697b3dc4d7dd04ebf6277f1bfaf1