diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-05 14:50:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-05 14:50:57 -0400 |
| commit | 2ff664ee20836ecd7b9e3e9a368766b4125f21a8 (patch) | |
| tree | 133a7545437891761e64c4df8f3ae8d9980ac9a6 /src/common/address.h | |
| parent | d290e36576c07b288a6347385d144a493869bd97 (diff) | |
| parent | b3469e4207d12821993f1d2d381c5d27918a4c01 (diff) | |
| download | tor-2ff664ee20836ecd7b9e3e9a368766b4125f21a8.tar.gz tor-2ff664ee20836ecd7b9e3e9a368766b4125f21a8.zip | |
Merge remote-tracking branch 'public/bug10801_024'
Conflicts:
src/common/address.c
src/or/config.c
Diffstat (limited to 'src/common/address.h')
| -rw-r--r-- | src/common/address.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/address.h b/src/common/address.h index 61de3d2d96..8dc63b71c1 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -210,7 +210,8 @@ int tor_addr_port_split(int severity, const char *addrport, char **address_out, uint16_t *port_out); int tor_addr_port_parse(int severity, const char *addrport, - tor_addr_t *address_out, uint16_t *port_out); + tor_addr_t *address_out, uint16_t *port_out, + int default_port); int tor_addr_hostname_is_local(const char *name); |