commit a7290cc82d814daec50d01a7693adc45afac3ef0 Merge: 77e3a43 01e7cb7 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 23 10:03:14 2015 -0500

Merge remote-tracking branch 'arthuredelstein/14555+'

control-spec.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)