diff options
| author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-01-29 07:37:06 +1100 |
|---|---|---|
| committer | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-01-29 07:37:06 +1100 |
| commit | c4cb4706c9bb1087584c9813b0ca97c261e6fd77 (patch) | |
| tree | a49ffc5b86a9412f2992c5966c550e5bedfc60f6 /src/or/directory.h | |
| parent | 42dea56363c24960e85344749644f6502f625463 (diff) | |
| parent | 73fc67bc8906819a42ed44abe33179512f90a883 (diff) | |
| download | tor-c4cb4706c9bb1087584c9813b0ca97c261e6fd77.tar.gz tor-c4cb4706c9bb1087584c9813b0ca97c261e6fd77.zip | |
Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged
Conflicts:
src/or/directory.c
src/test/test_routerlist.c
Fix minor conflicts.
Diffstat (limited to 'src/or/directory.h')
| -rw-r--r-- | src/or/directory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/directory.h b/src/or/directory.h index c5b5a5afe1..2630705fdb 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -68,8 +68,8 @@ 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 tor_addr_t *addr, - uint16_t or_port, uint16_t dir_port, +void directory_initiate_command(const tor_addr_t *or_addr, uint16_t or_port, + const tor_addr_t *dir_addr, uint16_t dir_port, const char *digest, uint8_t dir_purpose, uint8_t router_purpose, dir_indirection_t indirection, |