From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 11 Sep 2014 03:36:27 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/torrc_minimal'
X-Git-Tag: tor-0.2.6.1-alpha~137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5474d8ae05da1a7b896a12e5857b2dbe0b0b8ce6;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/torrc_minimal'
---

5474d8ae05da1a7b896a12e5857b2dbe0b0b8ce6