commit 65a6103afc39890f41f6f5e7ba7e4ef570af1622 parent d45bf0c65caa98b6e41046c22fbecf76cd8e1f8d Author: Nick Mathewson <nickm@torproject.org> Date: Sat, 18 Nov 2017 11:02:58 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "Ours" merge to avoid taking ticket18329_minimal_025