commit fa6b42699937f12c7a814edcff4ef8e17db086db Merge: 16bddc3 5ff31ff Author: Nick Mathewson <nickm at torproject.org> Date: Wed Mar 1 08:19:45 2017 -0500 Merge branch 'maint-0.3.0'