commit 6c355d576354a252c642ff6f3e7781580c007c48 Merge: a1b0a0b9c 25d50decb Author: Nick Mathewson <nickm at torproject.org> Date: Thu Nov 30 11:48:12 2017 -0500 Merge branch 'maint-0.3.2'