commit f5deb2feaa0105610002459ad3f0defd3f33a534 Merge: 077f6a4 ad1824f Author: Nick Mathewson <nickm at torproject.org> Date: Thu Sep 22 15:37:27 2016 -0400 Merge branch 'maint-0.2.8'