diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-13 10:48:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-13 10:48:07 -0400 |
| commit | 600744b4be3d83a3e4924c8712bc30b7de1f4d3c (patch) | |
| tree | 9060cc5d17499fc87b93c8d14492df8cae1a9e59 /src/common/address.h | |
| parent | 87c79cf01760787bcd9e8616b17babe5a7e4eca4 (diff) | |
| parent | 5f2a1a7b4f20be121cd30def95cf7789924ca70a (diff) | |
| download | tor-600744b4be3d83a3e4924c8712bc30b7de1f4d3c.tar.gz tor-600744b4be3d83a3e4924c8712bc30b7de1f4d3c.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/config.c
src/or/dirserv.c
src/or/or.h
Diffstat (limited to 'src/common/address.h')
| -rw-r--r-- | src/common/address.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/address.h b/src/common/address.h index 3087906340..e41e4c2ba4 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -44,6 +44,7 @@ socklen_t tor_addr_to_sockaddr(const tor_addr_t *a, uint16_t port, int tor_addr_from_sockaddr(tor_addr_t *a, const struct sockaddr *sa, uint16_t *port_out); void tor_addr_make_unspec(tor_addr_t *a); +char *tor_sockaddr_to_str(const struct sockaddr *sa); /** Return an in6_addr* equivalent to <b>a</b>, or NULL if <b>a</b> is not * an IPv6 address. */ |