commit ba1bb90a726ead9a5bb8a8fa6f14d31b06822258 Merge: 3a6bd2144 21babc8d3 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jul 30 09:01:59 2018 -0400 Merge branch 'maint-0.3.4'