commit 7bd563b44ae9a38cf76d99c0705fd1b71f782d15 Merge: 5bd7418 f7b6969 Author: Nick Mathewson nickm@torproject.org Date: Sat Feb 7 08:21:52 2015 -0500

Merge remote-tracking branch 'sebastian/random_spec_fixes'

control-spec.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)