merged fix from RC_1_0

ChangeLog

@@ -71,6 +71,7 @@
 	* almost completely changed the storage interface (for custom storage)
 	* added support for hashing pieces in multiple threads
 
+	* add missing port mapping functions to python binding
 	* fix bound-checking issue in bdecoder
 	* expose missing dht_settings fields to python
 	* add function to query the DHT settings

bindings/python/src/session.cpp

@@ -721,6 +721,8 @@ void bind_session()
         .def("is_paused", allow_threads(&lt::session::is_paused))
         .def("id", allow_threads(&lt::session::id))
         .def("get_cache_info", &get_cache_info1, (arg("handle") = torrent_handle(), arg("flags") = 0))
+        .def("add_port_mapping", allow_threads(&session::add_port_mapping))
+        .def("delete_port_mapping", allow_threads(&session::delete_port_mapping))
 
 #ifndef TORRENT_NO_DEPRECATE
         .def(
@@ -773,6 +775,11 @@ void bind_session()
 #endif // TORRENT_NO_DEPRECATE
         ;
 
+    enum_<session::protocol_type>("protocol_type")
+        .value("udp", session::udp)
+        .value("tcp", session::tcp)
+    ;
+
     enum_<lt::session::save_state_flags_t>("save_state_flags_t")
         .value("save_settings", lt::session::save_settings)
         .value("save_dht_settings", lt::session::save_dht_settings)

include/libtorrent/session.hpp

@@ -1218,7 +1218,7 @@ namespace libtorrent
 		// 
 		// deprecated. use settings_pack::enable_upnp instead
 		TORRENT_DEPRECATED
- 		void start_upnp();
+		void start_upnp();
 		TORRENT_DEPRECATED
 		void stop_upnp();