commit 3085343783d6914480dc71209f5441163ed8d4e2 Merge: aff4053 3d0c090 Author: Nick Mathewson <ni...@torproject.org> Date: Sun Jul 12 13:33:52 2015 -0400
Merge branch 'maint-0.2.6' into release-0.2.6 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --cc src/win32/orconfig.h index fd59446,d8e5245..14c0f70 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@@ -232,9 -232,10 +232,9 @@@ #define USING_TWOS_COMPLEMENT /* Version number of package */ - #define VERSION "0.2.6.9" + #define VERSION "0.2.6.10" - #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR #define RSHIFT_DOES_SIGN_EXTEND _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits