commit fe04a19cb794be9cbdbe09b6792799f010b108c7 Merge: 5a9b0374a 6059784be Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 13 20:36:04 2017 -0500 Merge branch 'maint-0.3.2'