c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33 from ooni/release/3.0.0-beta.3

Browse Source 
Bump version
This commit is contained in:
Arturo Filastò 2019-05-16 15:00:17 +02:00 committed by GitHub
commit e9bd5d8eb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nettests/nettests.go
View File

@ -81,7 +81,6 @@ func (c *Controller) Init(nt *mk.Nettest) error {
reportFilePath := c.msmtPath reportFilePath := c.msmtPath
geoIPCountryPath := filepath.Join(utils.GeoIPDir(c.Ctx.Home), "GeoLite2-Country.mmdb") geoIPCountryPath := filepath.Join(utils.GeoIPDir(c.Ctx.Home), "GeoLite2-Country.mmdb")
geoIPASNPath := filepath.Join(utils.GeoIPDir(c.Ctx.Home), "GeoLite2-ASN.mmdb") geoIPASNPath := filepath.Join(utils.GeoIPDir(c.Ctx.Home), "GeoLite2-ASN.mmdb")
caBundlePath := getCaBundlePath()
msmtPath := c.msmtPath msmtPath := c.msmtPath
log.Debugf("OutputPath: %s", msmtPath) log.Debugf("OutputPath: %s", msmtPath)
@ -113,6 +112,7 @@ func (c *Controller) Init(nt *mk.Nettest) error {
nt.Options.CaBundlePath = sslCertFile nt.Options.CaBundlePath = sslCertFile
} }
log.Debugf("CaBundlePath: %s", nt.Options.CaBundlePath)
log.Debugf("GeoIPASNPath: %s", nt.Options.GeoIPASNPath) log.Debugf("GeoIPASNPath: %s", nt.Options.GeoIPASNPath)
log.Debugf("GeoIPCountryPath: %s", nt.Options.GeoIPCountryPath) log.Debugf("GeoIPCountryPath: %s", nt.Options.GeoIPCountryPath)

2
ooni.go
View File

@ -16,7 +16,7 @@ import (
"upper.io/db.v3/lib/sqlbuilder" "upper.io/db.v3/lib/sqlbuilder"
) )
const Version = "3.0.0-beta.2" const Version = "3.0.0-beta.3"
// Context for OONI Probe // Context for OONI Probe
type Context struct { type Context struct {