commit e0903ebd88a47a03a5e432e1a6c98452ae8a9008 parent f7eff2f8c53dacb7c375bbe6bc9cced95103307d Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 1 Mar 2018 16:43:42 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" to avoid version bump.