commit 92ff8bac286432141843691be7a4d3a7cf4664b0 Merge: 1bd12a4 1632d6e Author: Nick Mathewson <nickm@torproject.org> Date: Tue Apr 26 13:41:44 2016 -0400 Merge remote-tracking branch 'yawning-schwanenleid/feature18685' control-spec.txt | 11 +++++++++++ 1 file changed, 11 insertions(+)