From: Nick Mathewson Date: Wed, 30 Jul 2014 17:59:39 +0000 (-0400) Subject: Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint... X-Git-Tag: tor-0.2.5.7-rc~19^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88590ed3a66423fd4de3ad10dc67f1c9b18bf047;p=thirdparty%2Ftor.git Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5 --- 88590ed3a66423fd4de3ad10dc67f1c9b18bf047