[tor/el6] Update to upstream release 0.2.5.10

[Jamie Nguyen]

commit fef948eae076c66af374d4635b8af3fd488fd842
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Oct 27 18:23:35 2014 +0000

    Update to upstream release 0.2.5.10

 .gitignore |    2 ++
 sources    |    4 ++--
 tor.spec   |    7 +++++--
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 449c5f0..1010fe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 /tor-0.2.4.24.tar.gz.asc
 /tor-0.2.4.25.tar.gz
 /tor-0.2.4.25.tar.gz.asc
+/tor-0.2.5.10.tar.gz
+/tor-0.2.5.10.tar.gz.asc
diff --git a/sources b/sources
index d2d545f..311044e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-454744ebff5033ae353f2dd6b1bc425e  tor-0.2.4.25.tar.gz
-d92082a9ec977d8400c4dd108bacf16e  tor-0.2.4.25.tar.gz.asc
+4bde375229a7a7f77c0596ae05556527  tor-0.2.5.10.tar.gz
+1bb7f0535848c6f22ba1c438fc5b1683  tor-0.2.5.10.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 1e91209..845a106 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
 %global rundir      %{_localstatedir}/run/%{name}
 
 Name:       tor
-Version:    0.2.4.25
+Version:    0.2.5.10
 Release:    1%{?dist}
 Group:      System Environment/Daemons
 License:    BSD
@@ -81,7 +81,7 @@ mkdir -p $RPM_BUILD_ROOT%{rundir}
 install -D -p -m 0755 %SOURCE10 $RPM_BUILD_ROOT%{_initrddir}/tor
 install -D -p -m 0644 %SOURCE2  $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/tor
 install -D -p -m 0644 %SOURCE3  $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults-torrc
-install -D -p -m 0755 contrib/torctl $RPM_BUILD_ROOT%{_bindir}/torctl
+install -D -p -m 0755 contrib/dist/torctl $RPM_BUILD_ROOT%{_bindir}/torctl
 
 
 %pre
@@ -133,6 +133,9 @@ fi
 
 
 %changelog
+* Mon Oct 27 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.5.10-1
+- update to upstream release 0.2.5.10
+
 * Wed Oct 22 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.4.25-1
 - update to upstream release 0.2.4.25