diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-05-19 14:49:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-05-19 14:49:54 -0400 |
| commit | a45526c230d91e037438566287fd212fa4510480 (patch) | |
| tree | 01ca03b2e79e02e8e7aad337aeeb111f7e3672ec /src | |
| parent | e1366d907a81796ad985dc5d50c533e24c26528a (diff) | |
| parent | b3a225fb13d57125888bc6e2c84bdca9abce00f6 (diff) | |
| download | tor-a45526c230d91e037438566287fd212fa4510480.tar.gz tor-a45526c230d91e037438566287fd212fa4510480.zip | |
Merge branch 'maint-0.2.6' into release-0.2.6
Conflicts:
configure.ac
contrib/win32build/tor-mingw.nsi.in
src/win32/orconfig.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/win32/orconfig.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index e9591e19f8..466822e410 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,8 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.7" - +#define VERSION "0.2.6.8" #define HAVE_STRUCT_SOCKADDR_IN6 |