commit 2777b469fa9e62763cdaee94c10446cf49d7d378 Merge: ef9251157 ece63105d Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 13 11:13:22 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1