diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-05 12:44:40 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-05 12:44:40 -0500 |
| commit | f0b2dc83b60b0de1644ce9fb5e19fef516e9ffde (patch) | |
| tree | ee8e9b36590f7cb2f349aa25eeb1abd33e20a7b1 /src/or/directory.h | |
| parent | 12954908623a285606ec7522168cd2ac7e799525 (diff) | |
| parent | 74e6a47a808803c985f55b626dff294dbe425043 (diff) | |
| download | tor-f0b2dc83b60b0de1644ce9fb5e19fef516e9ffde.tar.gz tor-f0b2dc83b60b0de1644ce9fb5e19fef516e9ffde.zip | |
Merge remote-tracking branch 'arma/ticket5528'
Conflicts:
src/or/router.c
src/test/test_dir.c
Diffstat (limited to 'src/or/directory.h')
| -rw-r--r-- | src/or/directory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/directory.h b/src/or/directory.h index 3de69329a4..bc200797d4 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -63,7 +63,7 @@ int connection_dir_process_inbuf(dir_connection_t *conn); int connection_dir_finished_flushing(dir_connection_t *conn); int connection_dir_finished_connecting(dir_connection_t *conn); void connection_dir_about_to_close(dir_connection_t *dir_conn); -void directory_initiate_command(const char *address, const tor_addr_t *addr, +void directory_initiate_command(const tor_addr_t *addr, uint16_t or_port, uint16_t dir_port, const char *digest, uint8_t dir_purpose, uint8_t router_purpose, |