nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-29 00:03:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse Source
This commit is contained in:
Nick Mathewson 2013-03-18 15:39:21 -04:00
commit 5124bc251a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/dnsserv.c
View File

@ -170,7 +170,8 @@ evdns_server_callback(struct evdns_server_request *req, void *data_)
* response; -1 if we couldn't launch the request. * response; -1 if we couldn't launch the request.
*/ */
int 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; entry_connection_t *entry_conn;
edge_connection_t *conn; edge_connection_t *conn;

3
src/or/dnsserv.h
View File

@ -20,7 +20,8 @@ void dnsserv_resolved(entry_connection_t *conn,
const char *answer, const char *answer,
int ttl); int ttl);
void dnsserv_reject_request(entry_connection_t *conn); 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 #endif

2
src/or/entrynodes.c
View File

@ -367,7 +367,7 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend,
} else { } else {
const routerstatus_t *rs; const routerstatus_t *rs;
rs = router_pick_directory_server(MICRODESC_DIRINFO|V3_DIRINFO, 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) if (!rs)
return NULL; return NULL;
node = node_get_by_id(rs->identity_digest); node = node_get_by_id(rs->identity_digest);