commit bfc9be4c777bb2349e7c3ec6763896620e285f7e Merge: dc79d5299 f7b41bcdf Author: Nick Mathewson <nickm at torproject.org> Date: Mon Dec 11 16:50:48 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2