From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 23 Dec 2016 16:02:04 +0000 (-0500)
Subject: Merge branch 'maint-0.2.9'
X-Git-Tag: tor-0.3.0.2-alpha~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fbb66fa77939ffcfc57056ce212e7ecf98ad7af;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9'
---

1fbb66fa77939ffcfc57056ce212e7ecf98ad7af