commit 6059784be0b022adbe274035acc920381ca3fef0 Merge: 985c41b50 1d5e693b6 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 13 20:36:04 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2