commit ca554b22f850da93d26c18119e0e251a58c6072e Merge: fdd13697d dc79d5299 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Dec 11 16:46:00 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2