commit ac44e70ffc047941d196596dd651019c054b7faf Merge: e619fd02e 573b6e4f2 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Aug 22 09:37:31 2018 -0400 Merge branch 'maint-0.3.4'