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