diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-27 16:16:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-27 16:16:27 -0400 |
| commit | 0c5a44ed0a790951bdfd319eec734c04eb972a08 (patch) | |
| tree | 89f4945bd65bc06450b95131cfcf04b6da54fd5d /src/or/or.h | |
| parent | e232938ec82c8c35b99331995d1aeaca67ba9ec1 (diff) | |
| parent | bffe0d3ccc6b49975eae9173b0c1c465d40d2dbf (diff) | |
| download | tor-0c5a44ed0a790951bdfd319eec734c04eb972a08.tar.gz tor-0c5a44ed0a790951bdfd319eec734c04eb972a08.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 389e572d6c..00a359c533 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3036,8 +3036,10 @@ typedef struct { config_line_t *RecommendedVersions; config_line_t *RecommendedClientVersions; config_line_t *RecommendedServerVersions; - /** Whether dirservers refuse router descriptors with private IPs. */ + /** Whether dirservers allow router descriptors with private IPs. */ int DirAllowPrivateAddresses; + /** Whether routers accept EXTEND cells to routers with private IPs. */ + int ExtendAllowPrivateAddresses; char *User; /**< Name of user to run Tor as. */ char *Group; /**< Name of group to run Tor as. */ config_line_t *ORPort_lines; /**< Ports to listen on for OR connections. */ |