diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-05 12:44:40 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-05 12:44:40 -0500 |
| commit | f0b2dc83b60b0de1644ce9fb5e19fef516e9ffde (patch) | |
| tree | ee8e9b36590f7cb2f349aa25eeb1abd33e20a7b1 /src/or/or.h | |
| parent | 12954908623a285606ec7522168cd2ac7e799525 (diff) | |
| parent | 74e6a47a808803c985f55b626dff294dbe425043 (diff) | |
| download | tor-f0b2dc83b60b0de1644ce9fb5e19fef516e9ffde.tar.gz tor-f0b2dc83b60b0de1644ce9fb5e19fef516e9ffde.zip | |
Merge remote-tracking branch 'arma/ticket5528'
Conflicts:
src/or/router.c
src/test/test_dir.c
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index e49a3b08a5..0df5af12c4 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2009,7 +2009,6 @@ typedef int16_t country_t; /** Information about another onion router in the network. */ typedef struct { signed_descriptor_t cache_info; - char *address; /**< Location of OR: either a hostname or an IP address. */ char *nickname; /**< Human-readable OR name. */ uint32_t addr; /**< IPv4 address of OR, in host order. */ |