From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 13 May 2015 15:04:17 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.7.2-alpha~160
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b76314d3a1430f4440dcbec4f5026564981f2030;p=thirdparty%2Ftor.git

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

b76314d3a1430f4440dcbec4f5026564981f2030