[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

nickm at torproject.org nickm at torproject.org
Wed Jan 31 19:34:28 UTC 2018


commit d44080a09da4cf05c6b2895ef7ac97c65acdd8b8
Merge: 98dd3757b 56857291b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 14:33:27 2018 -0500

    Merge branch 'maint-0.3.2'
    
    "ours" merge to avoid backport of #25105



More information about the tor-commits mailing list