[tor-commits] [tor/release-0.2.3] Merge branch 'link_negotiation_assert_023' into release-0.2.3