commit e53daee2f49aea30129f95fa1145b291565b3919 Merge: ebcd1a57c 441bfcd88 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 13 11:13:22 2017 -0500 Merge branch 'maint-0.3.2'