commit 9aa7ebca2903ba666a1c42c8902265a94caeff0d Merge: 58c51dc 9d1801b Author: Nick Mathewson <nickm@torproject.org> Date: Sun Jul 12 16:37:33 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 14c0f70,82e7e65..0bdaf92 --- 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.10" + #define VERSION "0.2.6.10-dev" - #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR #define RSHIFT_DOES_SIGN_EXTEND