commit 5d4ff915cb2fda4fa416bfbe4d51387b81edac42 Merge: 9fe6ffa 4732e15 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Dec 8 09:06:10 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9