Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

circumvention: add the tor experiment #100

Merged
merged 9 commits into from
Jan 28, 2020
Merged

circumvention: add the tor experiment #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
16cb6b1
go.mod go.sum: update all non-probe-engine deps
bassosimone Jan 25, 2020
50eb860
go get -v github.com/ooni/probe-engine@v0.5.0
bassosimone Jan 25, 2020
18c77e4
go.mod go.sum: pin to probe-engine dependencies
bassosimone Jan 25, 2020
e191622
circumvention: add basic implementation of tor
bassosimone Jan 25, 2020
e8c7b64
Readme.md: document how to update dependencies
bassosimone Jan 25, 2020
620b0a0
go get -v github.com/ooni/probe-engine@fcc9ee0a7afb
bassosimone Jan 27, 2020
fbb9fee
Merge remote-tracking branch 'origin/master' into issue/973
bassosimone Jan 27, 2020
e0e3dcd
go get -v github.com/ooni/probe-engine@4d254f5b2
bassosimone Jan 27, 2020
50fcc3e
nettests/tor.go: implement summary test keys
bassosimone Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,22 @@ Be sure you have golang >= 1.13. We use golang modules. Run
to get information on the supported systems as well as to get
instructions on how to install dependencies.

## Updating dependencies

1. update every direct dependency in `go.mod` except `probe-engine`
using `go get -u -v $dependency`

2. pin to the latest version of the `probe-engine` with
`go get -v github.com/ooni/probe-engine@tag`

3. remove all indirect dependencies from `go.mod` and merge the
content of `probe-engine`'s `go.mod` into our `go.mod`

4. `go mod tidy`

The rationale of this procedure is that we want to pin exactly to
a specific version of psiphon and of its dependencies.

## Releasing

```
Expand Down
17 changes: 6 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
module github.com/ooni/probe-cli

go 1.12
go 1.13

require (
github.com/alecthomas/kingpin v2.2.6+incompatible
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
github.com/apex/log v1.1.1
github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40 // indirect
github.com/fatih/color v1.7.0
github.com/certifi/gocertifi v0.0.0-20200104152315-a6d78f326758 // indirect
github.com/fatih/color v1.9.0
github.com/getsentry/raven-go v0.0.0-20190419175539-919484f041ea
github.com/kr/pty v1.1.8 // indirect
github.com/mattn/go-colorable v0.1.4
github.com/mattn/go-isatty v0.0.11 // indirect
github.com/ooni/probe-engine v0.4.0
github.com/pkg/errors v0.8.1
github.com/rubenv/sql-migrate v0.0.0-20191213152630-06338513c237
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 // indirect
github.com/ooni/probe-engine v0.5.1-0.20200127201608-4d254f5b22b4
github.com/pkg/errors v0.9.1
github.com/rubenv/sql-migrate v0.0.0-20200119084958-8794cecc920c
gopkg.in/AlecAivazis/survey.v1 v1.8.7
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
upper.io/db.v3 v3.6.3+incompatible
Expand Down
Loading