commit 4959085ca15fa6170b720139b5e1aeab95dee5c0 Merge: 43c2a65 5508508 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 6 09:30:29 2018 -0400

Merge remote-tracking branch 'ageis/control-getinfo-uptime'

control-spec.txt | 2 ++ 1 file changed, 2 insertions(+)