commit 8408331b3e965dfad3c79fadc51f0b01eed366fe parent ec4a7641f10a7f799d686f289a94679176cdc761 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 10 Sep 2018 09:41:39 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 "ours" to avoid version bump.