commit b9da340cdf8703e08a288d1654c4a5be9efaa414 Merge: 122ee5b13 6f9ab69b6 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 13 11:18:02 2017 -0500 Merge branch 'maint-0.3.2'