[tor-commits] [tor/master] Merge remote-tracking branch 'intrigeri/bug13196-systemd-writable-run-directory'

[nickm at torproject.org]

commit bc758e4a5e10739d65eafa9ce2624c49859f317b
Merge: 4c8b809 2f47ab2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 22 10:31:24 2014 -0400

    Merge remote-tracking branch 'intrigeri/bug13196-systemd-writable-run-directory'

 changes/bug13196-systemd-writable-run-directory |    3 +++
 contrib/dist/tor.service.in                     |    1 +
 2 files changed, 4 insertions(+)