diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-01 21:49:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-01 21:49:01 -0400 |
| commit | fc9e84062b73535b63bb3cf555604b1acbcc4c61 (patch) | |
| tree | 8c47eb7b3f82bb6bf00c19481f058372fa68fd84 /src/common/address.h | |
| parent | dfc32177d9ec3b8a639d6831ca4bc92c4f273dcb (diff) | |
| parent | 408bd98e79196933e447cbc68c73ecffebaf5a19 (diff) | |
| download | tor-fc9e84062b73535b63bb3cf555604b1acbcc4c61.tar.gz tor-fc9e84062b73535b63bb3cf555604b1acbcc4c61.zip | |
Merge remote-tracking branch 'public/bug4645'
Conflicts:
src/or/dirserv.c
Diffstat (limited to 'src/common/address.h')
| -rw-r--r-- | src/common/address.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/common/address.h b/src/common/address.h index d41c2f570f..61de3d2d96 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -215,7 +215,6 @@ int tor_addr_port_parse(int severity, const char *addrport, int tor_addr_hostname_is_local(const char *name); /* IPv4 helpers */ -int is_internal_IP(uint32_t ip, int for_listening); int addr_port_lookup(int severity, const char *addrport, char **address, uint32_t *addr, uint16_t *port_out); int parse_port_range(const char *port, uint16_t *port_min_out, |