commit eb92d11f53dd2245f4cfd618bde3996e76b498cf parent 95a88f72832d9385ef8e4199d29f8f46090a4584 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 8 Jun 2017 14:05:59 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 "ours" merge to avoid version bump.