commit a5599fb71c51ddec47282164f71cfb06933096cc Merge: 7f6c0fce4 d1eac7830 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Oct 18 09:12:58 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5