From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 19 Jan 2016 01:16:05 +0000 (-0500)
Subject: Merge branch 'fallbacks-0281-squashed'
X-Git-Tag: tor-0.2.8.1-alpha~38
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=7b6d7aae09ae2fe1b809c57d228c4de0bf72aa67;p=thirdparty%2Ftor.git

Merge branch 'fallbacks-0281-squashed'
---

7b6d7aae09ae2fe1b809c57d228c4de0bf72aa67