]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'candrews/issue13805'
authorNick Mathewson <nickm@torproject.org>
Sun, 11 Jan 2015 16:24:48 +0000 (11:24 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 11 Jan 2015 16:24:48 +0000 (11:24 -0500)
1  2 
contrib/dist/tor.service.in

Simple merge