commit a45526c230d91e037438566287fd212fa4510480
Merge: e1366d9 b3a225f
Author: Nick Mathewson <[email protected]>
Date: Tue May 19 14:49:54 2015 -0400
Merge branch 'maint-0.2.6' into release-0.2.6
Conflicts:
configure.ac
contrib/win32build/tor-mingw.nsi.in
src/win32/orconfig.h
configure.ac | 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --cc src/win32/orconfig.h
index e9591e1,c0ab2de..466822e
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@@ -232,10 -232,10 +232,9 @@@
#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
#define HAVE_STRUCT_IN6_ADDR
#define RSHIFT_DOES_SIGN_EXTEND
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
