[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5

[nickm at torproject.org]

commit 88590ed3a66423fd4de3ad10dc67f1c9b18bf047
Merge: 7760916 0a70579
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 30 13:59:39 2014 -0400

    Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5

 changes/bug12730-systemd-verify-config |    3 +++
 contrib/dist/tor.service.in            |    1 +
 2 files changed, 4 insertions(+)