commit 663b659434267f1c8edb1a130f10d6f3a91da831 Merge: bfd5000 a931d15 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Jul 7 12:44:07 2016 -0400 Merge branch 'maint-0.2.8'