]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint...
authorNick Mathewson <nickm@torproject.org>
Wed, 30 Jul 2014 17:59:39 +0000 (13:59 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 30 Jul 2014 17:59:39 +0000 (13:59 -0400)

Trivial merge