commit e0aa6bee4adc3eaf32606776b48b68b09b0a6052 Merge: fb33bcb 83dc072 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Jun 29 18:45:57 2017 -0400 Merge branch 'maint-0.3.1' "ours" merge to avoid version bump.