From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Dec 2013 17:45:22 +0000 (-0500)
Subject: Merge remote-tracking branch 'resetius/https'
X-Git-Tag: release-2.1.4-alpha~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2fbc3b148b1f3734d8e1d5bccb0861502ffba4e7;p=libevent

Merge remote-tracking branch 'resetius/https'
---

2fbc3b148b1f3734d8e1d5bccb0861502ffba4e7