diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-13 10:48:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-13 10:48:07 -0400 |
| commit | 600744b4be3d83a3e4924c8712bc30b7de1f4d3c (patch) | |
| tree | 9060cc5d17499fc87b93c8d14492df8cae1a9e59 /src/or/control.h | |
| parent | 87c79cf01760787bcd9e8616b17babe5a7e4eca4 (diff) | |
| parent | 5f2a1a7b4f20be121cd30def95cf7789924ca70a (diff) | |
| download | tor-600744b4be3d83a3e4924c8712bc30b7de1f4d3c.tar.gz tor-600744b4be3d83a3e4924c8712bc30b7de1f4d3c.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/config.c
src/or/dirserv.c
src/or/or.h
Diffstat (limited to 'src/or/control.h')
| -rw-r--r-- | src/or/control.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/control.h b/src/or/control.h index bec067792e..f8b8a990a5 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -15,6 +15,8 @@ void control_update_global_event_mask(void); void control_adjust_event_log_severity(void); +void control_ports_write_to_file(void); + /** Log information about the connection <b>conn</b>, protecting it as with * CONN_LOG_PROTECT. Example: * |