commit f9b650fca6babce75db081ebf6a21bb79aea15cb Merge: 63c9495 59f4cae Author: Nick Mathewson <nickm at torproject.org> Date: Thu Nov 3 18:36:55 2016 -0400 Merge branch 'maint-0.2.9'