commit 441bfcd8856ee98f4d622e4ebbfcabe24624ca66 Merge: 512dfa15e 2777b469f Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 13 11:13:22 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2