diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-17 17:10:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-17 17:10:16 -0400 |
| commit | 661bd3fe714f0c9986eb872eb8eb5d72b2efc195 (patch) | |
| tree | 4f6df23ef60b07682ff8e5b1653d96c8cb9601d4 /src | |
| parent | 1c64f99a1a74cac4074ddefa958fd4ae7acddcb2 (diff) | |
| parent | 88859b2ff1fdd4e5f4fab8ad818131ea3c2dd1c8 (diff) | |
| download | tor-661bd3fe714f0c9986eb872eb8eb5d72b2efc195.tar.gz tor-661bd3fe714f0c9986eb872eb8eb5d72b2efc195.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/config.h b/src/or/config.h index 48f4e8630c..dd76edcf1d 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -102,6 +102,5 @@ int addressmap_register_auto(const char *from, const char *to, addressmap_entry_source_t addrmap_source, const char **msg); - #endif |