diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-19 16:55:07 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-11-19 16:55:07 -0500 |
| commit | 21be4b5b4ca4412c958a80e65279e5f1babe8535 (patch) | |
| tree | 040b56c544c1046ca4e420629839cc56c07b3ed1 /src/win32 | |
| parent | c77a32932de1b13309dd85eb7c4dd4cdb44c962b (diff) | |
| parent | c643e0527c186b8ef2d259b2ef11a10c1d4ee3e5 (diff) | |
| download | tor-21be4b5b4ca4412c958a80e65279e5f1babe8535.tar tor-21be4b5b4ca4412c958a80e65279e5f1babe8535.tar.gz | |
Merge commit 'c643e0527c186b8ef2d259b2ef11a10c1d4ee3e5'
Conflicts:
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
Diffstat (limited to 'src/win32')
| -rw-r--r-- | src/win32/orconfig.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 7708e90b8..dc84d7849 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -234,4 +234,3 @@ /* Version number of package */ #define VERSION "0.2.3.0-alpha-dev" - |