[tor/el5] Update to upstream release 0.2.5.11

[Jamie Nguyen]

commit b7d0ebbc97b86013f0affd5083130846dae08203
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Mar 23 20:44:40 2015 +0000

    Update to upstream release 0.2.5.11

 .gitignore              |  2 ++
 sources                 |  4 ++--
 tor-0.2.5.11.tar.gz.asc | 14 ++++++++++++++
 tor.spec                |  7 +++++--
 4 files changed, 23 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 812c0b4..cb64c2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ tor-0.2.1.19.tar.gz
 /tor-0.2.3.25.tar.gz.asc
 /tor-0.2.4.25.tar.gz
 /tor-0.2.4.25.tar.gz.asc
+/tor-0.2.5.11.tar.gz
+/tor-0.2.5.11.tar.gz.asc
diff --git a/sources b/sources
index d2d545f..15e9778 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
+9ca64f76996cb8a750e50c792e2c4c52  tor-0.2.5.11.tar.gz
+5641043a829cf761e74650010568263c  tor-0.2.5.11.tar.gz.asc
diff --git a/tor-0.2.5.11.tar.gz.asc b/tor-0.2.5.11.tar.gz.asc
new file mode 100644
index 0000000..85700f8
--- /dev/null
+++ b/tor-0.2.5.11.tar.gz.asc
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQGVAwUAVQgwjZEDl9iNKTGaAQLt6wv/SPWWXqD+M/rJ0KsMr4lgBTT0k2GHkkZZ
+QPeyFzOI6a67bDFWnNFRBfXPbB0IQEhBpeWDXf0OjjvkX97bckTwKttUv53voM4S
+ZbiFzcNQkGQs5uwYHq4f84pI66jlbYc8FJBSaUwjevyTi2ridIgfyY6rqWrM0V3E
+AEAsojb4OHJrFNZ/es41AF+2Ssyz2RvgtOn+zoREABVOC0o8l/GDXgivuZpT+h1J
+63/RSO2LMtimd2Qn2SfG9SddugEcU30qOnKMYKyZ+7jjEeuKK6hib7K4iZnpQ/wr
+ai4bHSbIDy2ms1rAqOAiux/CzSIiEAeZF8eKfcFU8szyQhy73AJRQdv2NsFQ9lYY
+U6DDP5HGX5xOqDu7JC3Ru+hzzHVALpJbWd5AqlWUXi+fw9bUhtGuiTPaKM0G2ZmG
+RJAIXYQhPv8ZqpRdvQ1n6OeUsrnpoi+b532lDDoosREDZyGQ+s6hES9q9Ba2fcQI
+sHXyantfw8xnKFJH/TG7O3dHygvi5+FI
+=x9C8
+-----END PGP SIGNATURE-----
diff --git a/tor.spec b/tor.spec
index c7657d5..41f60bb 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.11
 Release:           1%{?dist}
 Group:             System Environment/Daemons
 License:           BSD
@@ -83,7 +83,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
 
 
 %clean
@@ -140,6 +140,9 @@ fi
 
 
 %changelog
+* Mon Mar 23 2015 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.5.11-1
+- update to upstream release 0.2.5.11
+
 * Wed Oct 22 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.4.25-1
 - update to upstream release 0.2.4.25
 - reduce diff between el6 and el5