From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 13 Nov 2015 13:42:20 +0000 (-0500)
Subject: Merge commit '7b859fd8c558c9cf08add79db87fb1cb76537535'
X-Git-Tag: tor-0.2.8.1-alpha~244
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bdbcdaed8ed95986de854488572b6b822ab8435;p=thirdparty%2Ftor.git

Merge commit '7b859fd8c558c9cf08add79db87fb1cb76537535'
---

7bdbcdaed8ed95986de854488572b6b822ab8435