commit 8239af0d9cb3e45e4c5ff04ab057450934e306cf parent b53322024967746b24eb47ac688ddfbf7df8599f Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 8 Jun 2017 09:29:12 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.