diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-08-21 10:37:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-08-21 10:37:01 -0400 |
| commit | 3b6d2f9bf407ee560bafaeabb02b3bc88caa680a (patch) | |
| tree | f20d08ea0db20ec548e53ae1fea7221ea897cd96 /src/or/control.c | |
| parent | b58dfba76f2d34d8401130137705f2ab1f9bf8c9 (diff) | |
| parent | 1633d1ad1d334b183e123192ccd8edc6277dad22 (diff) | |
| download | tor-3b6d2f9bf407ee560bafaeabb02b3bc88caa680a.tar.gz tor-3b6d2f9bf407ee560bafaeabb02b3bc88caa680a.zip | |
Merge branch 'workqueue_squashed'
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c index ed2fedac32..220e7e514f 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -6478,3 +6478,4 @@ control_testing_set_global_event_mask(uint64_t mask) global_event_mask = mask; } #endif + |