[tor-commits] [torspec/master] Merge remote-tracking branch 'arma/task19035-spec'

27 May 2016


      commit ebb7d8701d000683ec7016176996f168dd10637b
Merge: c15dada c0ae722
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri May 27 15:18:29 2016 -0400

    Merge remote-tracking branch 'arma/task19035-spec'

[tor-commits] [torspec/master] Merge remote-tracking branch 'arma/task19035-spec'

nickm＠torproject.org