From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 15 Jan 2015 17:38:43 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.6.3-alpha~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d807c7c8725acb85a6695ab399f99c2509a245c4;p=thirdparty%2Ftor.git

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

d807c7c8725acb85a6695ab399f99c2509a245c4