commit 4e6f2abdcf82f3773eb6ce4035809b58f04edf50 Merge: 92ff8ba 56b3ef3 Author: Nick Mathewson <nickm@torproject.org> Date: Wed May 4 16:24:04 2016 -0400 Merge remote-tracking branch 'teor/bug18851' control-spec.txt | 2 ++ 1 file changed, 2 insertions(+)