From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 16 Oct 2013 15:20:43 +0000 (-0400)
Subject: Merge remote-tracking branch 'linus/bug9206_option'
X-Git-Tag: tor-0.2.5.2-alpha~122
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17d368281ad374908fb019e29f3f012659be010c;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'linus/bug9206_option'
---

17d368281ad374908fb019e29f3f012659be010c