diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-23 15:54:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-23 15:54:33 -0400 |
| commit | 8e5d3cab2636aa7a41fd14a09e027cee9fe42df2 (patch) | |
| tree | 316b3db48a808144c4f3244e357c5a0f44652b74 /src | |
| parent | 95ad59fa79cba73a6916b5deccee12b541d5f756 (diff) | |
| parent | a6688c574e569a2a018038414198ab440344ba95 (diff) | |
| download | tor-8e5d3cab2636aa7a41fd14a09e027cee9fe42df2.tar tor-8e5d3cab2636aa7a41fd14a09e027cee9fe42df2.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuitbuild.c | 3 | ||||
| -rw-r--r-- | src/or/main.c | 3 | ||||
| -rw-r--r-- | src/or/nodelist.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index cfd1956e5..074b78d96 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -5602,8 +5602,7 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node) /* XXXipv6 we lack support for falling back to another address for the same relay, warn the user */ - if (!tor_addr_is_null(&ri->ipv6_addr)) - { + if (!tor_addr_is_null(&ri->ipv6_addr)) { tor_addr_port_t ap; router_get_pref_orport(ri, &ap); log_notice(LD_CONFIG, diff --git a/src/or/main.c b/src/or/main.c index 1f3117b23..95ac8d616 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2597,8 +2597,7 @@ tor_main(int argc, char *argv[]) // a file on a folder shared by the wm emulator. // if no flashcard (real or emulated) is present, // log files will be written in the root folder - if (find_flashcard_path(path,MAX_PATH) == -1) - { + if (find_flashcard_path(path,MAX_PATH) == -1) { redir = _wfreopen( L"\\stdout.log", L"w", stdout ); redirdbg = _wfreopen( L"\\stderr.log", L"w", stderr ); } else { diff --git a/src/or/nodelist.c b/src/or/nodelist.c index f7f302417..d17850888 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -689,8 +689,7 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { router_get_prim_orport(node->ri, ap_out); - } - else if (node->rs) { + } else if (node->rs) { tor_addr_from_ipv4h(&ap_out->addr, node->rs->addr); ap_out->port = node->rs->or_port; } |