From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 25 Feb 2015 14:30:29 +0000 (-0500)
Subject: Merge remote-tracking branch 'atagar/trac14806'
X-Git-Tag: tor-0.2.7.1-alpha~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b913777c78e61897e530a91f5c60c8a94a2c1c7;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'atagar/trac14806'
---

1b913777c78e61897e530a91f5c60c8a94a2c1c7