Merge branch 'bug14478_squashed'
commitf794a091647050efa97719581f99c453b38074dd
authorNick Mathewson <nickm@torproject.org>
Wed, 11 Feb 2015 20:59:41 +0000 (11 15:59 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 11 Feb 2015 20:59:41 +0000 (11 15:59 -0500)
tree719c797002a6a53419efd53fbadee0d62ec6b795
parent99e915dbfea9b2b985a10368721d9c79b358abbe
parentdfb409b8b0b9bfcc4531e0a41b1924d55128c991
Merge branch 'bug14478_squashed'