diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:23:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:23:53 -0400 |
| commit | 2527acb2dc8b71515ac0c882e3af4fc034ab1b48 (patch) | |
| tree | 48bdb4a6919a11fdb337969bb46353701895ad54 /src/common/compat.h | |
| parent | cb7fff193e2749f241e646b155de3ee33623606e (diff) | |
| parent | b80a8bba199b9adfb9c893641ba770566fa548e1 (diff) | |
| download | tor-2527acb2dc8b71515ac0c882e3af4fc034ab1b48.tar.gz tor-2527acb2dc8b71515ac0c882e3af4fc034ab1b48.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/Makefile.am
src/or/control.c
Diffstat (limited to 'src/common/compat.h')
| -rw-r--r-- | src/common/compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/compat.h b/src/common/compat.h index 66303c4810..a317ea45c5 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -403,7 +403,7 @@ int get_n_open_sockets(void); #define tor_socket_send(s, buf, len, flags) send(s, buf, len, flags) #define tor_socket_recv(s, buf, len, flags) recv(s, buf, len, flags) -/** Implementatino of struct in6_addr for platforms that do not have it. +/** Implementation of struct in6_addr for platforms that do not have it. * Generally, these platforms are ones without IPv6 support, but we want to * have a working in6_addr there anyway, so we can use it to parse IPv6 * addresses. */ |