diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:19:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:19:04 -0400 |
| commit | b80a8bba199b9adfb9c893641ba770566fa548e1 (patch) | |
| tree | 2fba8dea9940d46863834f139ed350f7c0eaeffb /src/common/compat_libevent.c | |
| parent | 1ba1bdee4bd8f3c00e603fe9b0fd2f14eeb60466 (diff) | |
| parent | 1e69c60dccc358a7146c2b5e7825ea729498b41b (diff) | |
| download | tor-b80a8bba199b9adfb9c893641ba770566fa548e1.tar.gz tor-b80a8bba199b9adfb9c893641ba770566fa548e1.zip | |
Merge branch 'feature3049-v2' into maint-0.2.2
Conflicts:
src/common/Makefile.am
Diffstat (limited to 'src/common/compat_libevent.c')
| -rw-r--r-- | src/common/compat_libevent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 3ad9be145d..6d89be804b 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -48,7 +48,7 @@ typedef uint32_t le_version_t; * it is. */ #define LE_OLD V(0,0,0) /** Represents a version of libevent so weird we can't figure out what version - * it it. */ + * it is. */ #define LE_OTHER V(0,0,99) static le_version_t tor_get_libevent_version(const char **v_out); |