18 Dec
2018
18 Dec
'18
1:04 p.m.
commit a5c9ae8526f179e588dc9de73a5c89ffaca70ad8 Merge: 5a22b42c3 d8f41c287 Author: Nick Mathewson nickm@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.