commit 6384d314fb47a088299a14b52e5f60b6e79697b4 parent 9f1899fdfd611861bd1a254a6ba6df4ddf05f5da Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 16 Feb 2018 09:55:41 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" merge to avoid taking 24902 a second time and having to reconcile all the merge conflicts.
