commit bdc29eaa7efa4227cd718325d966c4e139a2fd47 Merge: a75ae628c 684d57fe8 Author: Nick Mathewson <nickm at torproject.org> Date: Sun Feb 11 17:01:00 2018 -0500 Merge branch 'maint-0.3.2'