[tor/el6] update to upstream 0.2.4.22

[Sam Kottler]

commit 663821b249a65772de09967f66458973387a2381
Author: Sam Kottler <shk at linux.com>
Date:   Tue Jun 10 12:27:53 2014 -0400

    update to upstream 0.2.4.22

 .gitignore |    2 ++
 sources    |    4 ++--
 tor.spec   |    9 ++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8bd3db8..e180035 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /tor-0.2.3.25.tar.gz
 /tor-0.2.3.25.tar.gz.asc
+/tor-0.2.4.22.tar.gz
+/tor-0.2.4.22.tar.gz.asc
diff --git a/sources b/sources
index 6eae516..d632532 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a1c364189a9a66ed9daa8e6436489daf  tor-0.2.3.25.tar.gz
-a4c12795ffb8f68550a5dab4a9eb0654  tor-0.2.3.25.tar.gz.asc
+5a7eee0d9df87233255d78b25c6f8270  tor-0.2.4.22.tar.gz
+9037e75135965a3b08406e02650a5192  tor-0.2.4.22.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index c2ac806..697cbe7 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,8 +7,8 @@
 %global rundir      %{_localstatedir}/run/%{name}
 
 Name:       tor
-Version:    0.2.3.25
-Release:    6%{?dist}
+Version:    0.2.4.22
+Release:    1%{?dist}
 Group:      System Environment/Daemons
 License:    BSD
 Summary:    Anonymizing overlay network for TCP (The onion router)
@@ -120,10 +120,10 @@ fi
 %dir %{_datadir}/tor
 %{_datadir}/tor/defaults-torrc
 %{_datadir}/tor/geoip
+%{_datadir}/tor/geoip6
 %{_initrddir}/tor
 
 %dir %{_sysconfdir}/tor
-%config(noreplace) %{_sysconfdir}/tor/tor-tsocks.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/tor/torrc
 %config(noreplace) %{_sysconfdir}/logrotate.d/tor
 
@@ -133,6 +133,9 @@ fi
 
 
 %changelog
+* Tue Jun 10 2014 Sam Kottler <skottler at fedoraproject.org> - 0.2.4.22-1
+- update to upstream version 0.2.4.22 (BZ#1103177)
+
 * Mon Mar 04 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.3.25-6
 - no need to change the default configuration file
 - do not include doc/TODO which doesn't contain anything useful