commit 1a7af7470fdd6173f1b876fc6fee2b171174b4ff parent f3804f5999c7eb5cdfddf039f623bcffb89732b8 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 8 Jun 2017 14:05:37 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 "ours" merge to avoid version bump.