commit ef9c00f53962713e1f7866004f3b83a136cfcedc Merge: 3455274 8d9602c Author: Nick Mathewson <[email protected]> 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.
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
