commit f0d440681c022deb7a5dd34a1ea0c7a1805cafcc Merge: 572f23a96 2cb8c8d99 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jul 31 14:32:01 2017 -0400 Merge branch 'maint-0.3.1' "ours" merge to avoid version bump.