[tor-commits] [tor/master] Merge remote-tracking branch 'ageis/control-getinfo-uptime'

[nickm at torproject.org]

commit e95b13f8ce383634eb10dc0a634971fb020daa76
Merge: bcfab63ca 4ba26f95d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 6 09:30:55 2018 -0400

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

 src/feature/control/control.c | 4 ++++
 1 file changed, 4 insertions(+)