diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-02-23 07:36:56 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-02-23 07:36:56 -0500 |
| commit | e88686cb2cbae39333982505f38f2d7568af4f32 (patch) | |
| tree | 874f90fe8e155a791d0adec61d52accd3bc073e2 /src/or/or.h | |
| parent | 48c1c028ca65c9fbdb83f47e5ccda0469b031bdd (diff) | |
| parent | 0ba672a7fdb952c612ee9215bd7e8a6b02f4f8f7 (diff) | |
| download | tor-e88686cb2cbae39333982505f38f2d7568af4f32.tar.gz tor-e88686cb2cbae39333982505f38f2d7568af4f32.zip | |
Merge remote-tracking branch 'teor/bug18348-v2'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h index 6fd6dfc5fb..0daa9e7025 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4092,8 +4092,8 @@ typedef struct { int ClientUseIPv6; /** If true, prefer an IPv6 OR port over an IPv4 one for entry node * connections. If auto, bridge clients prefer IPv6, and other clients - * prefer IPv4. Use fascist_firewall_prefer_ipv6_orport() instead of - * accessing this value directly. */ + * prefer IPv4. Use node_ipv6_or_preferred() instead of accessing this value + * directly. */ int ClientPreferIPv6ORPort; /** If true, prefer an IPv6 directory port over an IPv4 one for direct * directory connections. If auto, bridge clients prefer IPv6, and other |