[tor-commits] [torspec/master] Merge remote-tracking branch 'meejah/4971'

[nickm at torproject.org]

commit d716b885bbc91c6f885bb77174a80816c1d61faf
Merge: 903a65f a9bddcf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 28 15:17:22 2012 -0400

    Merge remote-tracking branch 'meejah/4971'

 control-spec.txt |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)