| commit | e3f4a96528ad52c480a360bf7782446f5a06f622 | |
| author | Roger Dingledine <arma@torproject.org> | |
| Mon, 28 Jul 2014 08:14:39 +0000 (28 04:14 -0400) | ||
| committer | Roger Dingledine <arma@torproject.org> | |
| Mon, 28 Jul 2014 08:14:39 +0000 (28 04:14 -0400) | ||
| tree | 83d14eff564483779dce69244f8a64891cca39e4 | treesnapshot (tar.gz zip) |
| parent | 6c4a26b8ca3d8f61f55ad63baea2090e44fbc126 | commitdiff |
| parent | 77609161f37dc37420f240410f2f546fc431cb8c | commitdiff |
Merge branch 'maint-0.2.5'
Conflicts:
configure.ac
contrib/win32build/tor-mingw.nsi.in
src/win32/orconfig.h
Conflicts:
configure.ac
contrib/win32build/tor-mingw.nsi.in
src/win32/orconfig.h