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

[ensc]

commit 61ec01360c346ee04c10d53fa5ba93386452ce87
Merge: 6628684 ba4e330
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date:   Sat Dec 17 13:03:04 2011 +0100

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

 tor.logrotate       |    2 ++
 tor.spec            |    9 ++++++++-
 tor.systemd.service |    8 ++------
 3 files changed, 12 insertions(+), 7 deletions(-)
---
diff --cc tor.spec
index 7f00920,cd53b22..8af6bbb
--- a/tor.spec
+++ b/tor.spec
@@@ -14,7 -14,23 +14,7 @@@
  
  Name:		tor
  Version:	0.2.2.35
- Release:	%release_func 1600
 -Release:	%release_func 1701
++Release:	%release_func 1601
  Group:		System Environment/Daemons
  License:	BSD
  Summary:	Anonymizing overlay network for TCP (The onion router)
@@@ -239,7 -244,14 +239,14 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 -* Sat Dec 17 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.2.35-1701
++* Sat Dec 17 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.2.35-1601
+ - added 'su' logrotate option (#751525)
+ - fixed systemd unit file; customization of TimeoutSec + LimitNOFILE is
+   not possible by environment variables. Hardcode some values which can
+   be overridden by the systemd .include method (#755167).
+ - added systemd rule in the postrotate script
+ 
 -* 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