[tor-commits] [tor/master] Merge remote-tracking branch 'candrews/issue13805'

[nickm at torproject.org]

commit c98e075ebc17d7e5b4548cc58f58088cff83d0ca
Merge: e009c2d 5bdf12c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jan 11 11:24:48 2015 -0500

    Merge remote-tracking branch 'candrews/issue13805'

 contrib/dist/tor.service.in |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)