| commit | 598c61362f1b3d3e3a93d15240c7306d955273be | |
| author | Roger Dingledine <arma@torproject.org> | |
| Mon, 28 Jul 2014 08:08:18 +0000 (28 04:08 -0400) | ||
| committer | Roger Dingledine <arma@torproject.org> | |
| Mon, 28 Jul 2014 08:08:18 +0000 (28 04:08 -0400) | ||
| tree | f421163ee642d74b411bc7c038f8b23bb061d313 | treesnapshot (tar.gz zip) |
| parent | 9ac169584481b14f97397507fd208a967a187880 | commitdiff |
| parent | fcbb21b414947d8ad7e4298d3952b84d8005dabc | commitdiff |
Merge branch 'maint-0.2.4' into release-0.2.4
Conflicts:
configure.ac
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
Conflicts:
configure.ac
contrib/tor-mingw.nsi.in
src/win32/orconfig.h