commit 0603779114920dabb3ec0178f2b646480619c372 Merge: 6ea9d3f 8f44d28 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jul 5 13:06:06 2016 -0400 Merge branch 'maint-0.2.8' This is an "ours" merge, to avoid messing with the version.