From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 1 Feb 2016 14:52:11 +0000 (-0500)
Subject: Merge branch 'options_validate_second_round_cleaned'
X-Git-Tag: tor-0.2.8.1-alpha~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4ac44c9f200bc19801021f9fc0b8ff12a648c96;p=thirdparty%2Ftor.git

Merge branch 'options_validate_second_round_cleaned'
---

f4ac44c9f200bc19801021f9fc0b8ff12a648c96