From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 27 Nov 2015 16:54:52 +0000 (-0500)
Subject: Merge branch 'fix-policies-memory-v2-squashed'
X-Git-Tag: tor-0.2.8.1-alpha~197
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85a48d5e471c62003d58e615bac8e1bd8c09631a;p=thirdparty%2Ftor.git

Merge branch 'fix-policies-memory-v2-squashed'
---

85a48d5e471c62003d58e615bac8e1bd8c09631a