commit 116c8409ba0e304306ee98a0ebb15450f130fae2 Merge: f7c97cd 0e53742 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 5 11:35:26 2012 -0400

Merge remote-tracking branch 'linus/bug6770_3'

Conflicts: doc/tor.1.txt src/or/config.c

doc/tor.1.txt | 11 +++++------ src/or/config.c | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-)

diff --cc doc/tor.1.txt index 93bde59,c4fac40..9a8de25 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -1747,13 -1747,19 +1747,12 @@@ DIRECTORY AUTHORITY SERVER OPTION votes on whether to accept relays as hidden service directories. (Default: 1)

- **AuthDirHasIPv6Connectivity** **0**|**1**|**auto**:: - - Authoritative directories only. When set to 1, IPv6 OR ports are - being tested for reachability and voted on. When set to auto, Tor - tries to find out if the authority relay has IPv6 connectivity or - not. (Default: auto) + **AuthDirHasIPv6Connectivity** **0**|**1**:: - + Authoritative directories only. When set to 0, OR ports with an + IPv6 address are being accepted without reachability testing. + When set to 1, IPv6 OR ports are being tested just like IPv4 OR + ports. (Default: 0)

-**AuthDirPublishIPv6** **0**|**1**:: - - Authoritative directories only. When set to 0, Tor will not - include IPv6 OR ports in votes. When set to 1, Tor will vote for - IPv6 OR ports. (Default: 0). - HIDDEN SERVICE OPTIONS ----------------------

diff --cc src/or/config.c index 8c41c7f,949d1a2..6027668 --- a/src/or/config.c +++ b/src/or/config.c @@@ -204,7 -204,8 +204,7 @@@ static config_var_t _option_vars[] = V(AuthDirListBadExits, BOOL, "0"), V(AuthDirMaxServersPerAddr, UINT, "2"), V(AuthDirMaxServersPerAuthAddr,UINT, "5"), - V(AuthDirHasIPv6Connectivity, AUTOBOOL, "auto"), - V(AuthDirHasIPv6Connectivity, BOOL, "0"), - V(AuthDirPublishIPv6, BOOL, "0"), ++ V(AuthDirHasIPv6Connectivity, AUTOBOOL, "0"), VAR("AuthoritativeDirectory", BOOL, AuthoritativeDir, "0"), V(AutomapHostsOnResolve, BOOL, "0"), V(AutomapHostsSuffixes, CSV, ".onion,.exit"),