commit 054d7c57f64e47d76e167fa6d3cba6353621c7a8 Merge: c57a119 aa5af6a Author: Nick Mathewson <nickm at torproject.org> Date: Wed Jun 28 13:58:37 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1