16 May
2014
16 May
'14
6:18 a.m.
commit ef9c00f53962713e1f7866004f3b83a136cfcedc Merge: 3455274 8d9602c Author: Nick Mathewson nickm@torproject.org Date: Fri May 16 09:17:34 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
This is an "ours" merge, to avoid taking the commit that bumped maint-0.2.4's version to 0.2.4.22-dev.