From 960064ee753706104db4e94baf5e120d27ac67d5 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Fri, 15 Jan 2016 23:59:52 +0100
Subject: [PATCH] bump typhoeus

---
 Gemfile.lock                | 6 +++---
 diaspora_federation.gemspec | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0eddb4c..8414488 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,7 +5,7 @@ PATH
       faraday (~> 0.9.0)
       faraday_middleware (~> 0.10.0)
       nokogiri (~> 1.6, >= 1.6.7.1)
-      typhoeus (~> 0.7)
+      typhoeus (~> 1.0)
       valid (~> 1.0)
     diaspora_federation-rails (0.0.11)
       diaspora_federation (= 0.0.11)
@@ -67,7 +67,7 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
-    ethon (0.8.0)
+    ethon (0.8.1)
       ffi (>= 1.3.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
@@ -259,7 +259,7 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tins (1.6.0)
-    typhoeus (0.8.0)
+    typhoeus (1.0.1)
       ethon (>= 0.8.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
diff --git a/diaspora_federation.gemspec b/diaspora_federation.gemspec
index 14f1aae..b848141 100644
--- a/diaspora_federation.gemspec
+++ b/diaspora_federation.gemspec
@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
   s.add_dependency "nokogiri", "~> 1.6", ">= 1.6.7.1"
   s.add_dependency "faraday", "~> 0.9.0"
   s.add_dependency "faraday_middleware", "~> 0.10.0"
-  s.add_dependency "typhoeus", "~> 0.7"
+  s.add_dependency "typhoeus", "~> 1.0"
   s.add_dependency "valid", "~> 1.0"
 end