mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-25 04:43:31 +01:00
Merge remote-tracking branch 'origin/maint-0.2.4'
This commit is contained in:
commit
5124bc251a
@ -170,7 +170,8 @@ evdns_server_callback(struct evdns_server_request *req, void *data_)
|
||||
* response; -1 if we couldn't launch the request.
|
||||
*/
|
||||
int
|
||||
dnsserv_launch_request(const char *name, int reverse, control_connection_t *control_conn)
|
||||
dnsserv_launch_request(const char *name, int reverse,
|
||||
control_connection_t *control_conn)
|
||||
{
|
||||
entry_connection_t *entry_conn;
|
||||
edge_connection_t *conn;
|
||||
|
@ -20,7 +20,8 @@ void dnsserv_resolved(entry_connection_t *conn,
|
||||
const char *answer,
|
||||
int ttl);
|
||||
void dnsserv_reject_request(entry_connection_t *conn);
|
||||
int dnsserv_launch_request(const char *name, int is_reverse, control_connection_t *control_conn);
|
||||
int dnsserv_launch_request(const char *name, int is_reverse,
|
||||
control_connection_t *control_conn);
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -367,7 +367,7 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend,
|
||||
} else {
|
||||
const routerstatus_t *rs;
|
||||
rs = router_pick_directory_server(MICRODESC_DIRINFO|V3_DIRINFO,
|
||||
PDS_PREFER_TUNNELED_DIR_CONNS_|PDS_FOR_GUARD);
|
||||
PDS_PREFER_TUNNELED_DIR_CONNS_|PDS_FOR_GUARD);
|
||||
if (!rs)
|
||||
return NULL;
|
||||
node = node_get_by_id(rs->identity_digest);
|
||||
|
Loading…
Reference in New Issue
Block a user