From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 1 Sep 2014 20:23:34 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.6.1-alpha~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67c0ad54263be7fb742a8d499f97f5908f9ec970;p=thirdparty%2Ftor.git

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

67c0ad54263be7fb742a8d499f97f5908f9ec970