commit c0e18d2f899b32c2c25429e7991e28d5c59ee4ef Merge: a88ce61b3 63312e029 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Nov 15 16:47:25 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5