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

nickm at torproject.org nickm at torproject.org
Tue Dec 18 13:04:49 UTC 2018


commit a5c9ae8526f179e588dc9de73a5c89ffaca70ad8
Merge: 5a22b42c3 d8f41c287
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 18 08:04:23 2018 -0500

    Merge branch 'maint-0.3.5'
    
    Use "git merge -s ours" to avoid a version bump.



More information about the tor-commits mailing list