commit ad90a136b2dc25e73d1c668c9284e7ddf748dfe9 Merge: 55aafbf7b 441bfcd88 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 13 11:13:22 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2