From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 30 Jul 2014 18:18:11 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.6.1-alpha~213
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0edb9b0492abbdd6c3ec397ad1f80c901568a713;p=thirdparty%2Ftor.git

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

0edb9b0492abbdd6c3ec397ad1f80c901568a713