[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm at torproject.org]

commit 6937ec7857d6a59045de31eb195325edc4b789ee
Merge: 2b34b23 b796ad0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 09:29:49 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 396149c,74a27f4..22a9d66
--- 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.11"
+ #define VERSION "0.2.6.12"
  
  
 -
  #define HAVE_STRUCT_SOCKADDR_IN6
  #define HAVE_STRUCT_IN6_ADDR
  #define RSHIFT_DOES_SIGN_EXTEND