From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 18 Jul 2013 15:24:57 +0000 (-0400)
Subject: Merge branch 'simpleq_for_cells_3'
X-Git-Tag: tor-0.2.5.1-alpha~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abedd35de08f2a2bd91d9d17e2f3cfd3b42ba52a;p=thirdparty%2Ftor.git

Merge branch 'simpleq_for_cells_3'
---

abedd35de08f2a2bd91d9d17e2f3cfd3b42ba52a