From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 1 Feb 2013 21:23:26 +0000 (-0500)
Subject: Merge branch 'rename_log_7599'
X-Git-Tag: tor-0.2.4.10-alpha~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec90ed4f6d1155d28fde91097e76f574195583c6;p=thirdparty%2Ftor.git

Merge branch 'rename_log_7599'
---

ec90ed4f6d1155d28fde91097e76f574195583c6