diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-01-16 16:29:54 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-01-16 16:29:54 -0500 |
| commit | 571c94a7358dc7b04a64ebac0e3b40150d6c4fce (patch) | |
| tree | 1faa9ba38647795e4fa23371aabb10a1344b5397 /src/win32 | |
| parent | b9f1bd3c4e665e90ad6f7cb6d34a687d635fe2cb (diff) | |
| parent | 5201e05fc55d479d95a8b908f6c33d2b88eee26c (diff) | |
| download | tor-571c94a7358dc7b04a64ebac0e3b40150d6c4fce.tar.gz tor-571c94a7358dc7b04a64ebac0e3b40150d6c4fce.zip | |
Merge remote branch 'origin/maint-0.2.1'
Conflicts:
ChangeLog
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
Diffstat (limited to 'src/win32')
| -rw-r--r-- | src/win32/orconfig.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index f58bb584b3..a76a8b4b3d 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -228,5 +228,3 @@ /* Version number of package */ #define VERSION "0.2.2.6-alpha-dev" - - |