commit 5a9b0374a0cacc5bd8424efaae6e3139419818e8 Merge: a5a87c1d9 985c41b50 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 13 16:58:21 2017 -0500 Merge branch 'maint-0.3.2'