| commit | 1f5b228ee89f237fa653313fb1824b60a717441f | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Mon, 20 Oct 2014 14:30:58 +0000 (20 10:30 -0400) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Mon, 20 Oct 2014 14:30:58 +0000 (20 10:30 -0400) | ||
| tree | 13043878c3bbf7987a2034bb85132e27f6a549f7 | treesnapshot (tar.gz zip) |
| parent | a8d6eb30b88ec56e2bdef9d8a12ff308fa0223b5 | commitdiff |
| parent | fed78bce8bc645866578a1739a10ee598bbaf4e0 | commitdiff |
Merge branch 'maint-0.2.4' into release-0.2.4
Conflicts:
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
Conflicts:
contrib/tor-mingw.nsi.in
src/win32/orconfig.h