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

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

feee44577133e0f76add0ae9c03d2b722f05cbb8