commit 1a907c659378b1748e65f8d94f7d212a91122247 parent 431c8d09ee062621d8b826799a667f746a783103 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 26 Jul 2017 15:37:53 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 This is an "ours" merge to avoid taking any changs from maint-0.3.0: we don't want to take the travis file, since there is a separate branch for putting it in 0.3.1 and later.
