From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 11 Jan 2018 17:39:37 +0000 (-0500)
Subject: Merge branch 'simplify_transition_allowed'
X-Git-Tag: tor-0.3.3.1-alpha~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=751595551afb6282d952c482a11db35daf3736ab;p=thirdparty%2Ftor.git

Merge branch 'simplify_transition_allowed'
---

751595551afb6282d952c482a11db35daf3736ab