From: Matt Joiner <anacrolix@gmail.com>
Date: Wed, 31 Aug 2022 01:09:47 +0000 (+1000)
Subject: Merge branch 'webrtc-conn-leak'
X-Git-Tag: v1.47.0~1
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=648acc0120a4fe6df275959f024930ed3380323a;p=btrtrc.git

Merge branch 'webrtc-conn-leak'
---

648acc0120a4fe6df275959f024930ed3380323a
diff --cc cmd/torrent/main.go
index 8c942e39,33e4eea9..58a26663
--- a/cmd/torrent/main.go
+++ b/cmd/torrent/main.go
@@@ -2,22 -2,23 +2,28 @@@
  package main
  
  import (
+ 	"context"
 +	"encoding/json"
  	"fmt"
 +	"io"
  	stdLog "log"
  	"net/http"
 +	"os"
+ 	"time"
  
 +	"github.com/davecgh/go-spew/spew"
  	"github.com/prometheus/client_golang/prometheus"
  	"github.com/prometheus/client_golang/prometheus/promhttp"
+ 	"go.opentelemetry.io/otel"
+ 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
+ 	"go.opentelemetry.io/otel/sdk/trace"
  
  	"github.com/anacrolix/bargle"
  	"github.com/anacrolix/envpprof"
+ 	"github.com/anacrolix/log"
  	xprometheus "github.com/anacrolix/missinggo/v2/prometheus"
  
 +	"github.com/anacrolix/torrent/bencode"
  	"github.com/anacrolix/torrent/version"
  )