[tor/f16: 3/3] Merge remote-tracking branch 'origin/master' into f16

[ensc]

commit 66286845b021b88079ce22d03333aecf8017a467
Merge: c7d60b3 b84c8ae
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date:   Sat Dec 17 12:32:36 2011 +0100

    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	tor.spec

 .gitignore |    2 ++
 lastver    |    2 +-
 sources    |    4 ++--
 tor.spec   |    8 +++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)
---
diff --cc tor.spec
index 95cc4aa,07faf26..7f00920
--- a/tor.spec
+++ b/tor.spec
@@@ -11,10 -11,26 +11,10 @@@
  %{!?_unitdir:%global _unitdir /lib/systemd/system}
  %{?with_noarch:%global noarch	BuildArch:	noarch}
  %{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
 -%{!?systemd_reqs:%global systemd_reqs \
 -Requires(post):		 /bin/systemctl\
 -Requires(preun):	 /bin/systemctl\
 -Requires(postun):	 /bin/systemctl\
 -%nil}
 -%{!?systemd_install:%global systemd_install()\
 -%post %1\
 -test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\
 -%preun %1\
 -test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\
 -test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\
 -%postun %1\
 -/bin/systemctl daemon-reload >/dev/null 2>&1 || :\
 -test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\
 -%nil}
 -
  
  Name:		tor
- Version:	0.2.2.34
+ Version:	0.2.2.35
 -Release:	%release_func 1700
 +Release:	%release_func 1600
  Group:		System Environment/Daemons
  License:	BSD
  Summary:	Anonymizing overlay network for TCP (The onion router)
@@@ -239,13 -244,19 +239,19 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 -* Sat Dec 17 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.2.35-1700
++* Sat Dec 17 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.2.35-1600
+ - updated to 0.2.2.35 (security)
+ - CVE-2011-2778: Tor heap-based buffer overflow
+ 
 -* Fri Oct 28 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.2.34-1700
 +* Fri Oct 28 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.2.34-1600
  - updated to 0.2.2.34; critical privacy/anonymity fixes
+ - CVE-2011-2768
+ - CVE-2011-2769
  
 -* Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2.33-1701
 +* Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2.33-1601
  - Rebuilt for glibc bug#747377
  
 -* Sun Sep 18 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.2.33-1700
 +* Sun Sep 18 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.2.33-1600
  - updated to 2.2.33
  - removed -doc subpackage because shipped files are not available
    anymore