commit df4bee06a9caed77cf1b2e887905434e4d626f8a Merge: 782dacf c77a39e 4b674a7 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 4 13:33:32 2013 -0500

Merge remote-tracking branches 'atagar/10086' and 'atagar/10085'

control-spec.txt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)