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

[nickm@xxxxxxxxxxxxxx]

commit d525d7aada590ee8898a6c88bd765cd1bcf06225
Merge: 249126f 57e778f
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 28 10:26:33 2017 -0500

    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 0bdaf92,59cd43e..396149c
--- 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-dev"
+ #define VERSION "0.2.6.11"
  
  
 -
  #define HAVE_STRUCT_SOCKADDR_IN6
  #define HAVE_STRUCT_IN6_ADDR
  #define RSHIFT_DOES_SIGN_EXTEND

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits