[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

20 Oct
2014
20 Oct
'14
2:30 p.m.
commit 1f5b228ee89f237fa653313fb1824b60a717441f Merge: a8d6eb3 fed78bc Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 20 10:30:58 2014 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 Conflicts: contrib/tor-mingw.nsi.in src/win32/orconfig.h contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
3870
Age (days ago)
3870
Last active (days ago)
0 comments
1 participants
participants (1)
-
nickm@torproject.org