[tor-commits] [tor/master] hs: Change default version from 2 to 3

[nickm at torproject.org]

commit e8557ba00ddbd1fa7882c937f50a8366d9d68746
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Aug 22 11:42:23 2018 -0400

    hs: Change default version from 2 to 3
    
    Closes #27215
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 doc/tor.1.txt               | 2 +-
 src/feature/hs/hs_service.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 0c010d94f..c40c27770 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2826,7 +2826,7 @@ The following options are used to configure a hidden service.
 
 [[HiddenServiceVersion]] **HiddenServiceVersion** **2**|**3**::
     A list of rendezvous service descriptor versions to publish for the hidden
-    service. Currently, versions 2 and 3 are supported. (Default: 2)
+    service. Currently, versions 2 and 3 are supported. (Default: 3)
 
 [[HiddenServiceAuthorizeClient]] **HiddenServiceAuthorizeClient** __auth-type__ __client-name__,__client-name__,__...__::
     If configured, the hidden service is accessible for authorized clients
diff --git a/src/feature/hs/hs_service.h b/src/feature/hs/hs_service.h
index 6ccd93551..17c654ecf 100644
--- a/src/feature/hs/hs_service.h
+++ b/src/feature/hs/hs_service.h
@@ -24,7 +24,7 @@
 /* When loading and configuring a service, this is the default version it will
  * be configured for as it is possible that no HiddenServiceVersion is
  * present. */
-#define HS_SERVICE_DEFAULT_VERSION HS_VERSION_TWO
+#define HS_SERVICE_DEFAULT_VERSION HS_VERSION_THREE
 
 /* As described in the specification, service publishes their next descriptor
  * at a random time between those two values (in seconds). */