commit 20136a8207f0cda0d23093a884caae0358f98bac Merge: 7be7f42 e9124b8 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Aug 24 14:46:27 2016 -0400 Merge branch 'maint-0.2.8'