Merge pull request #144 from libgit2/update

Update to master

1 files changed, 8 insertions, 1 deletions

diff --git a/git.go b/git.go
index adfa3b0..72d8d03 100644
--- a/git.go
+++ b/git.go
@@ -93,7 +93,14 @@ var (
 )
 
 func init() {
-	C.git_threads_init()
+	C.git_libgit2_init()
+
+	// This is not something we should be doing, as we may be
+	// stomping all over someone else's setup. The user should do
+	// this themselves or use some binding/wrapper which does it
+	// in such a way that they can be sure they're the only ones
+	// setting it up.
+	C.git_openssl_set_locking()
 }
 
 // Oid represents the id for a Git object.