sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.6' into release-0.2.6 

Conflicts:
	configure.ac
	contrib/win32build/tor-mingw.nsi.in
	src/win32/orconfig.h
This commit is contained in:
Nick Mathewson 2015-05-19 14:49:54 -04:00
parent e1366d907a b3a225fb13
commit a45526c230
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2015, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_INIT([tor],[0.2.6.7])
AC_INIT([tor],[0.2.6.8])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE

2
contrib/win32build/tor-mingw.nsi.in
View File

@ -8,7 +8,7 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
!define VERSION "0.2.6.7"
!define VERSION "0.2.6.8"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"

3
src/win32/orconfig.h
View File

@ -232,8 +232,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
#define VERSION "0.2.6.7"
#define VERSION "0.2.6.8"
#define HAVE_STRUCT_SOCKADDR_IN6