]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'houqp/hs_control'
authorNick Mathewson <nickm@torproject.org>
Mon, 3 Feb 2014 17:28:42 +0000 (12:28 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 3 Feb 2014 17:28:42 +0000 (12:28 -0500)
commitfee7f25ff845dc9a99dac59e67fdb9517750176c
tree8d77a633b56c05939cfff901a2f942da217ba99b
parent27d81c756b0e28266e75cf4cf897e486d11040b2
parentebd99314cff907433eca835926a325c019f4b6c0
Merge remote-tracking branch 'houqp/hs_control'
src/or/control.c
src/or/directory.c
src/or/router.c
src/or/router.h