commit 350fecfafe74d08be54d8162a01ab79dbe84d53a Merge: 51de3a1c1 122a7f884 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.3.2'