commit ebb7d8701d000683ec7016176996f168dd10637b Merge: c15dada c0ae722 Author: Nick Mathewson <nickm at torproject.org> Date: Fri May 27 15:18:29 2016 -0400 Merge remote-tracking branch 'arma/task19035-spec'