commit a14ff6b9c71ee4891b9c992821a63d2df09fcd38 Merge: d77e82769 e553bf3ce Author: Nick Mathewson <nickm at torproject.org> Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2