merging pr/2

This commit is contained in:
erinn 2018-10-09 15:00:53 -07:00
commit cafd7dad87
9 changed files with 15 additions and 14 deletions

View File

@ -1,6 +1,8 @@
## bulb - Is not stem ## bulb - Is not stem
### Yawning Angel (yawning at torproject dot org) ### Yawning Angel (yawning at torproject dot org)
** Asaur is a bulb fork by Open Privacy **
bulb is a Go language interface to the Tor control port. It is considerably bulb is a Go language interface to the Tor control port. It is considerably
lighter in functionality than stem and other controller libraries, and is lighter in functionality than stem and other controller libraries, and is
intended to be used in combination with`control-spec.txt`. intended to be used in combination with`control-spec.txt`.

View File

@ -5,7 +5,7 @@
// commons "cc0" public domain dedication. See LICENSE or // commons "cc0" public domain dedication. See LICENSE or
// <http://creativecommons.org/publicdomain/zero/1.0/> for full details. // <http://creativecommons.org/publicdomain/zero/1.0/> for full details.
package bulb package asaur
import ( import (
"crypto/hmac" "crypto/hmac"

View File

@ -5,20 +5,19 @@
// using the creative commons "cc0" public domain dedication. See LICENSE or // using the creative commons "cc0" public domain dedication. See LICENSE or
// <http://creativecommons.org/publicdomain/zero/1.0/> for full details. // <http://creativecommons.org/publicdomain/zero/1.0/> for full details.
package bulb package asaur
import ( import (
"crypto" "crypto"
"crypto/rsa" "crypto/rsa"
"encoding/base64" "encoding/base64"
"fmt"
"strings"
"errors" "errors"
"github.com/yawning/bulb/utils/pkcs1" "fmt"
"git.openprivacy.ca/openprivacy/asaur/utils/pkcs1"
"golang.org/x/net/proxy" "golang.org/x/net/proxy"
"log" "log"
"strconv" "strconv"
"strings"
) )
// OnionInfo is the result of the AddOnion command. // OnionInfo is the result of the AddOnion command.

View File

@ -5,13 +5,13 @@
// commons "cc0" public domain dedication. See LICENSE or // commons "cc0" public domain dedication. See LICENSE or
// <http://creativecommons.org/publicdomain/zero/1.0/> for full details. // <http://creativecommons.org/publicdomain/zero/1.0/> for full details.
package bulb package asaur
import ( import (
"strconv" "strconv"
"strings" "strings"
"github.com/yawning/bulb/utils" "git.openprivacy.ca/openprivacy/asaur/utils"
) )
// ProtocolInfo is the result of the ProtocolInfo command. // ProtocolInfo is the result of the ProtocolInfo command.

View File

@ -5,8 +5,8 @@
// commons "cc0" public domain dedication. See LICENSE or // commons "cc0" public domain dedication. See LICENSE or
// <http://creativecommons.org/publicdomain/zero/1.0/> for full details. // <http://creativecommons.org/publicdomain/zero/1.0/> for full details.
// Package bulb is a Go language interface to a Tor control port. // package asaur is a Go language interface to a Tor control port.
package bulb package asaur
import ( import (
"errors" "errors"

View File

@ -5,7 +5,7 @@
// commons "cc0" public domain dedication. See LICENSE or // commons "cc0" public domain dedication. See LICENSE or
// <http://creativecommons.org/publicdomain/zero/1.0/> for full details. // <http://creativecommons.org/publicdomain/zero/1.0/> for full details.
package bulb package asaur
import ( import (
"strconv" "strconv"

View File

@ -5,7 +5,7 @@
// the creative commons "cc0" public domain dedication. See LICENSE or // the creative commons "cc0" public domain dedication. See LICENSE or
// <http://creativecommons.org/publicdomain/zero/1.0/> for full details. // <http://creativecommons.org/publicdomain/zero/1.0/> for full details.
package bulb package asaur
import ( import (
"crypto" "crypto"

View File

@ -5,7 +5,7 @@
// commons "cc0" public domain dedication. See LICENSE or // commons "cc0" public domain dedication. See LICENSE or
// <http://creativecommons.org/publicdomain/zero/1.0/> for full details. // <http://creativecommons.org/publicdomain/zero/1.0/> for full details.
package bulb package asaur
import ( import (
"log" "log"

View File

@ -5,7 +5,7 @@
// commons "cc0" public domain dedication. See LICENSE or // commons "cc0" public domain dedication. See LICENSE or
// <http://creativecommons.org/publicdomain/zero/1.0/> for full details. // <http://creativecommons.org/publicdomain/zero/1.0/> for full details.
package bulb package asaur
import ( import (
"fmt" "fmt"