commit a93b6bbf17f8940a2b5cb9faad2ee054c85297c1
Merge: 02383ea f258064
Author: Nick Mathewson <nickm at torproject.org>
Date: Thu May 26 21:09:22 2016 -0400
Merge branch 'maint-0.2.8'
(This is an "ours" merge to avoid taking the version bump)