multi: remove Tor v2 support

Author: guggero

aperture.go

@@ -303,7 +303,7 @@ func (a *Aperture) Start(errChan chan error) error {
 	// will only be reached through the onion services, which already
 	// provide encryption, so running this additional HTTP server should be
 	// relatively safe.
-	if a.cfg.Tor.V2 || a.cfg.Tor.V3 {
+	if a.cfg.Tor.V3 {
 		torController, err := initTorListener(a.cfg, a.etcdClient)
 		if err != nil {
 			return err
@@ -623,16 +623,6 @@ func initTorListener(cfg *Config, etcd *clientv3.Client) (*tor.Controller, error
 		return nil, err
 	}
 
-	if cfg.Tor.V2 {
-		onionCfg.Type = tor.V2
-		addr, err := torController.AddOnion(onionCfg)
-		if err != nil {
-			return nil, err
-		}
-
-		log.Infof("Listening over Tor on %v", addr)
-	}
-
 	if cfg.Tor.V3 {
 		onionCfg.Type = tor.V3
 		addr, err := torController.AddOnion(onionCfg)

config.go

@@ -71,7 +71,6 @@ type TorConfig struct {
 	Control     string `long:"control" description:"The host:port of the Tor instance."`
 	ListenPort  uint16 `long:"listenport" description:"The port we should listen on for client requests over Tor. Note that this port should not be exposed to the outside world, it is only intended to be reached by clients through the onion service."`
 	VirtualPort uint16 `long:"virtualport" description:"The port through which the onion services created can be reached at."`
-	V2          bool   `long:"v2" description:"Whether we should listen for client requests through a v2 onion service."`
 	V3          bool   `long:"v3" description:"Whether we should listen for client requests through a v3 onion service."`
 }
 

sample-conf.yaml

@@ -143,9 +143,6 @@ tor:
   # The port through which the onion services to be created can be reached at.
   virtualport: 8082
 
-  # Whether a v2 onion service should be created to handle requests.
-  v2: false
-
   # Whether a v3 onion service should be created to handle requests.
   v3: false