commit 8a556f996c63a6c1cec8f22948e5c84acafb8057 Merge: 21a9e53 eb92d11 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 8 14:06:56 2017 -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 22a9d66,4a9ad29..4a2ae5b --- 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.12" + #define VERSION "0.2.6.12-dev"

- #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR #define RSHIFT_DOES_SIGN_EXTEND