]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'intrigeri/bug13196-systemd-writable-run-directory'
authorNick Mathewson <nickm@torproject.org>
Mon, 22 Sep 2014 14:31:24 +0000 (10:31 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 22 Sep 2014 14:31:24 +0000 (10:31 -0400)

Trivial merge