commit 880d596f4dbb65885ebbc8b1b88e852529779324 Merge: 49e8352f1 8b8d50104 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Oct 23 09:22:57 2017 -0400 Merge branch 'maint-0.3.2'