From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 28 Aug 2014 12:36:00 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.6.1-alpha~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc3b04a8c1edbeb1a488e319e3c0d28acd227417;p=thirdparty%2Ftor.git

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

cc3b04a8c1edbeb1a488e319e3c0d28acd227417