[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'

commit 0edb9b0492abbdd6c3ec397ad1f80c901568a713 Merge: f8cbba7 74a8555 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 30 14:18:11 2014 -0400

Merge remote-tracking branch 'origin/maint-0.2.5'

changes/bug12730-systemd-verify-config | 3 +++ changes/bug12731-systemd-no-run-as-daemon | 9 +++++++++ contrib/dist/tor.service.in | 5 ++++- 3 files changed, 16 insertions(+), 1 deletion(-)