From: Nick Mathewson Date: Wed, 10 Jun 2015 16:40:32 +0000 (-0400) Subject: Merge remote-tracking branch 'teor/bug16343-master-key-assert' X-Git-Tag: tor-0.2.7.2-alpha~95 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a60d9023c34a2c77b2211bb213b165a0e5bd4439;p=thirdparty%2Ftor.git Merge remote-tracking branch 'teor/bug16343-master-key-assert' --- a60d9023c34a2c77b2211bb213b165a0e5bd4439