commit dc79d5299d1ffebab06d2e5ea9ef5f9459e0fc9a Merge: acc462c96 d2031f2c6 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Dec 11 16:46:00 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2