diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-13 11:40:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-13 11:40:38 -0400 |
| commit | 5a3d9636f5e0ead80a46163af9ffadcbf6d5195f (patch) | |
| tree | 3f9a94eba2b969a313aa9ea01dd40f9b0eed9fca /src/or/or.h | |
| parent | 62a77f1117335f2ddee86f696379dde106ad1ee0 (diff) | |
| parent | ba9a12119c88676fa0dd2a282d927840cd5d94fb (diff) | |
| download | tor-5a3d9636f5e0ead80a46163af9ffadcbf6d5195f.tar tor-5a3d9636f5e0ead80a46163af9ffadcbf6d5195f.tar.gz | |
Merge remote-tracking branch 'public/bug3940_redux'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 9ca9239ce..7ff628411 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3855,6 +3855,11 @@ typedef enum { /** We're remapping this address because we got a DNS resolution from a * Tor server that told us what its value was. */ ADDRMAPSRC_DNS, + + /** No remapping has occurred. This isn't a possible value for an + * addrmap_entry_t; it's used as a null value when we need to answer "Why + * did this remapping happen." */ + ADDRMAPSRC_NONE } addressmap_entry_source_t; /********************************* control.c ***************************/ |