From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 7 Jan 2015 16:55:50 +0000 (-0500)
Subject: Merge remote-tracking branch 'public/bug12985_025'
X-Git-Tag: tor-0.2.6.3-alpha~191
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1abd526c75eade83318a6ec6aff84d5f0f079a3b;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug12985_025'
---

1abd526c75eade83318a6ec6aff84d5f0f079a3b