From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 25 Oct 2012 14:21:01 +0000 (-0400)
Subject: Merge branch 'link_negotiation_assert_024'
X-Git-Tag: tor-0.2.4.5-alpha~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48cdcc9d4ad12b7c57c8ac578db5961da27fde85;p=thirdparty%2Ftor.git

Merge branch 'link_negotiation_assert_024'
---

48cdcc9d4ad12b7c57c8ac578db5961da27fde85