diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-28 13:48:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-28 13:48:52 -0400 |
| commit | e84127d99e3f3ac95239cc857d401289ef5cb768 (patch) | |
| tree | 20657478ee8a868c04c7400091cee0adebfc11f8 /src/or/directory.h | |
| parent | a242d194c74b318b8ee4b347efd09ed13d0d2549 (diff) | |
| parent | 6009c891655748eb2089afa8bc4a3d54ec2ddab9 (diff) | |
| download | tor-e84127d99e3f3ac95239cc857d401289ef5cb768.tar.gz tor-e84127d99e3f3ac95239cc857d401289ef5cb768.zip | |
Merge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0
Diffstat (limited to 'src/or/directory.h')
| -rw-r--r-- | src/or/directory.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/directory.h b/src/or/directory.h index 8be1f8e76e..3d430f485a 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -12,6 +12,7 @@ #ifndef TOR_DIRECTORY_H #define TOR_DIRECTORY_H + int directories_have_accepted_server_descriptor(void); void directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, dirinfo_type_t type, const char *payload, @@ -79,7 +80,8 @@ void directory_initiate_command(const tor_addr_t *or_addr, uint16_t or_port, dir_indirection_t indirection, const char *resource, const char *payload, size_t payload_len, - time_t if_modified_since); + time_t if_modified_since, + struct circuit_guard_state_t *guard_state); #define DSR_HEX (1<<0) #define DSR_BASE64 (1<<1) |