From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Dec 2014 15:35:47 +0000 (-0500)
Subject: Merge branch 'asn-karsten-task-13192-5-squashed'
X-Git-Tag: tor-0.2.6.2-alpha~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64787e99faa794463e2e9a162340aa457018d321;p=thirdparty%2Ftor.git

Merge branch 'asn-karsten-task-13192-5-squashed'
---

64787e99faa794463e2e9a162340aa457018d321