From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Jun 2013 14:01:10 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a64d062c958eed643e3bb0802269af12f9eabcb7;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.4'
---

a64d062c958eed643e3bb0802269af12f9eabcb7