]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'decouple_controller_events_squashed'
authorNick Mathewson <nickm@torproject.org>
Tue, 18 Aug 2015 12:56:31 +0000 (08:56 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 18 Aug 2015 12:56:31 +0000 (08:56 -0400)
commiteafae7f677364175e384d0e2c79f05e7d300049d
treec91e6744961a2c38cdec3ce559199b4834c548c5
parentfe4c0a187dcc6ec8a14175dfc4c62334221d4239
parent087cf882c6a9ef6b9617d21ef26c19c47a4fc660
Merge branch 'decouple_controller_events_squashed'
src/common/compat_winthreads.c
src/or/config.c
src/or/control.c
src/or/main.c