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

Merge remote-tracking branch 'teor/comments-20151213'

Browse Source
This commit is contained in:
Nick Mathewson 2016-01-07 12:50:10 -08:00
commit 8d6aafbb4a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/address.c
View File

@ -1784,7 +1784,7 @@ tor_addr_port_parse(int severity, const char *addrport,
} }
/** Given an address of the form "host[:port]", try to divide it into its host /** Given an address of the form "host[:port]", try to divide it into its host
* ane port portions, setting *<b>address_out</b> to a newly allocated string * and port portions, setting *<b>address_out</b> to a newly allocated string
* holding the address portion and *<b>port_out</b> to the port (or 0 if no * holding the address portion and *<b>port_out</b> to the port (or 0 if no
* port is given). Return 0 on success, -1 on failure. */ * port is given). Return 0 on success, -1 on failure. */
int int

2
src/or/main.c
View File

@ -1301,7 +1301,7 @@ static periodic_event_item_t periodic_events[] = {
/* These are pointers to members of periodic_events[] that are used to /* These are pointers to members of periodic_events[] that are used to
* implement particular callbacks. We keep them separate here so that we * implement particular callbacks. We keep them separate here so that we
* can access them by name. We also keep them inside periodic_events[] * can access them by name. We also keep them inside periodic_events[]
* so that we can implement "reset all timers" in a reasaonable way. */ * so that we can implement "reset all timers" in a reasonable way. */
static periodic_event_item_t *check_descriptor_event=NULL; static periodic_event_item_t *check_descriptor_event=NULL;
static periodic_event_item_t *fetch_networkstatus_event=NULL; static periodic_event_item_t *fetch_networkstatus_event=NULL;
static periodic_event_item_t *launch_descriptor_fetches_event=NULL; static periodic_event_item_t *launch_descriptor_fetches_event=NULL;

4
src/or/or.h
View File

@ -2333,7 +2333,7 @@ typedef struct microdesc_t {
curve25519_public_key_t *onion_curve25519_pkey; curve25519_public_key_t *onion_curve25519_pkey;
/** Ed25519 identity key, if included. */ /** Ed25519 identity key, if included. */
ed25519_public_key_t *ed25519_identity_pkey; ed25519_public_key_t *ed25519_identity_pkey;
/** As routerinfo_t.ipv6_add */ /** As routerinfo_t.ipv6_addr */
tor_addr_t ipv6_addr; tor_addr_t ipv6_addr;
/** As routerinfo_t.ipv6_orport */ /** As routerinfo_t.ipv6_orport */
uint16_t ipv6_orport; uint16_t ipv6_orport;
@ -2351,7 +2351,7 @@ typedef struct microdesc_t {
* Specifically, a node_t is a Tor router as we are using it: a router that * Specifically, a node_t is a Tor router as we are using it: a router that
* we are considering for circuits, connections, and so on. A node_t is a * we are considering for circuits, connections, and so on. A node_t is a
* thin wrapper around the routerstatus, routerinfo, and microdesc for a * thin wrapper around the routerstatus, routerinfo, and microdesc for a
* single wrapper, and provides a consistent interface for all of them. * single router, and provides a consistent interface for all of them.
* *
* Also, a node_t has mutable state. While a routerinfo, a routerstatus, * Also, a node_t has mutable state. While a routerinfo, a routerstatus,
* and a microdesc have[*] only the information read from a router * and a microdesc have[*] only the information read from a router