commit 4d262035280101fcf54ab770ad3341215c261bd8 Merge: f69797b67 58e1c6dd8 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 1 11:30:33 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0