commit fa6137a903ef984f64d89e984cf285bf5158e08f Merge: 63e549a6b e2aacf100 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Jan 19 10:18:59 2018 -0500 Merge branch 'maint-0.3.2'