commit 77c5d8c73856da7f07508fc263685717bd88dbc7 parent fa73f59ad3902449826f31635e47aa4750b23209 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 8 Jun 2017 09:28:11 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 "ours" merge to avoid version bump.