commit fee2eaf2d4b401c0e6d879224bf42992a780085a Merge: bf8bb9c52 73de7b4bc Author: Nick Mathewson <nickm at torproject.org> Date: Fri Jan 4 15:04:58 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3