commit a35a97123e9a3e6b8c455c34b8e86e3201aeba96 Merge: 7908c8d 1d1c11f Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 25 12:47:49 2014 -0500 Merge remote-tracking branch 'rl1987/feature9503' control-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)